public
/
meta-st-stm32mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CONF: MACHINE WIC: fix dependency and ext4 generation 

A part of input are coming from PR #7

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Priouzeau Christophe <christophe.priouzeau@st.com>
This commit is contained in:
Priouzeau Christophe 2020-01-28 14:31:00 +01:00
parent 5d55695e90
commit f3b13cfc0a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conf/machine/stm32mp1-disco.conf
View File

@ -85,13 +85,17 @@ M4_BOARDS = "STM32MP157C-DK2"
# ========================================================================= # =========================================================================
WIC_CREATE_EXTRA_ARGS = "--no-fstab-update" WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
WKS_FILE_DEPENDS ?= " \ WKS_FILE_DEPENDS ?= " \
u-boot-stm32mp \ virtual/bootloader \
tf-a-stm32mp \ virtual/trusted-firmware-a \
${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \ virtual/trusted-firmware-a-serialboot \
${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual/optee-os', '', d)} \
st-image-bootfs \ st-image-bootfs \
st-image-vendorfs \ ${@bb.utils.contains('ST_VENDORFS','1','st-image-vendorfs', '', d)} \
st-image-userfs \ st-image-userfs \
" "
# for generated a WIC file, please uncomment the 2 following lines TRUSTED_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in','sdcard-stm32mp157c-dk2-trusted-1GB.wks.in',d)}"
#IMAGE_FSTYPES += "wic" OPTEE_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in','sdcard-stm32mp157c-dk2-optee-1GB.wks.in',d)}"
#WKS_FILE += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'sdcard-stm32mp157c-dk2-optee-1GB.wks', 'sdcard-stm32mp157c-dk2-trusted-1GB.wks', d)}"
# for generated a WIC file, please uncomment the 2 following lines or add them to local.conf
#IMAGE_FSTYPES += "wic ext4"
#WKS_FILE += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', '${OPTEE_WIC_FILE}', '${TRUSTED_WIC_FILE}', d)}"