From dde01fe03cbc212c4a6fce81e073169836b6cb4c Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 3 Oct 2023 08:43:29 +0200 Subject: [PATCH] ccmp1: don't build additional UBI/UBIFS images via meta-st-stm32mp layer Through the inclusion of 'nand-4-256' in BOOTDEVICE_LABELS, the include file 'st-machine-common-stm32mp.inc' adds strings to MULTIUBI_BUILD and IMAGE_FSTYPES that result in building ubi and ubifs images. These are redundant and not needed since meta-digi's 'image_types_digi.bbclass' already generates the needed ubifs images. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-8714 --- meta-digi-arm/conf/machine/include/ccmp1.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 15ff18221..fd74a2ad8 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -51,6 +51,11 @@ BOOTDEVICE_LABELS ?= "nand-4-256" # Supported boot schemes BOOTSCHEME_LABELS ?= "optee" +# Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc +# because image_types_digi.bbclass already builds their own. +MULTIUBI_BUILD:remove = "nand_4_256" +IMAGE_FSTYPES:remove = "stmultiubi" + # Wic files WKS_FILE += "ccmp1.wks.in" WKS_FILE_DEPENDS ?= " \