From f3b13cfc0a3a70932157611b5ddb815cd0352b69 Mon Sep 17 00:00:00 2001 From: Priouzeau Christophe Date: Tue, 28 Jan 2020 14:31:00 +0100 Subject: [PATCH] CONF: MACHINE WIC: fix dependency and ext4 generation A part of input are coming from PR #7 Signed-off-by: Leon Anavi Signed-off-by: Priouzeau Christophe --- conf/machine/stm32mp1-disco.conf | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/conf/machine/stm32mp1-disco.conf b/conf/machine/stm32mp1-disco.conf index a81117a..9ee2cea 100644 --- a/conf/machine/stm32mp1-disco.conf +++ b/conf/machine/stm32mp1-disco.conf @@ -85,13 +85,17 @@ M4_BOARDS = "STM32MP157C-DK2" # ========================================================================= WIC_CREATE_EXTRA_ARGS = "--no-fstab-update" WKS_FILE_DEPENDS ?= " \ - u-boot-stm32mp \ - tf-a-stm32mp \ - ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee-os-stm32mp', '', d)} \ + virtual/bootloader \ + virtual/trusted-firmware-a \ + virtual/trusted-firmware-a-serialboot \ + ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual/optee-os', '', d)} \ st-image-bootfs \ - st-image-vendorfs \ + ${@bb.utils.contains('ST_VENDORFS','1','st-image-vendorfs', '', d)} \ st-image-userfs \ " -# for generated a WIC file, please uncomment the 2 following lines -#IMAGE_FSTYPES += "wic" -#WKS_FILE += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'sdcard-stm32mp157c-dk2-optee-1GB.wks', 'sdcard-stm32mp157c-dk2-trusted-1GB.wks', d)}" +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)}" +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)}" + +# 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)}"