From aabf4cb72df54138126472c7efe56e8c432d2f6e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 18 Mar 2024 12:03:04 +0100 Subject: [PATCH] ccmp1: u-boot-dey: merge FIT signature config fragments into a single file Unless we have a use case in which we need to apply these fragments separately, we can merge them both into a single fragment. https://onedigi.atlassian.net/browse/DEL-8946 Signed-off-by: Gabriel Valcazar --- .../recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg | 1 - .../recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 7 +------ 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg deleted file mode 100644 index 27c702af0..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_LEGACY_IMAGE_FORMAT is not set diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg index 362903338..826c740cb 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg @@ -1,3 +1,4 @@ +# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_FIT_SIGNATURE=y CONFIG_RSA=y CONFIG_ECDSA=y diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 3c21e4595..5e921be4c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -9,13 +9,8 @@ DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/master" SRCREV = "${AUTOREV}" -UBOOT_FIT_CFG_FRAGMENTS = " \ - file://fit_legacy.cfg \ - file://fit_signature.cfg \ -" - SRC_URI += " \ - ${@oe.utils.conditional('TRUSTFENCE_FIT_IMG', '1', '${UBOOT_FIT_CFG_FRAGMENTS}', '', d)} \ + ${@oe.utils.conditional('TRUSTFENCE_FIT_IMG', '1', 'file://fit_signature.cfg', '', d)} \ " install_helper_files() {