From 0b6b220804d0b7dbd98659c19a7bf8ba66cd6936 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Tue, 23 Jul 2024 17:43:39 +0200 Subject: [PATCH] libubootenv: ccmp2: define same 'fw_env.config' as in ccimx9 Both CC93 and CCMP2 store the environment at the end of BOOT1 partition and the redundant environment at the end of BOOT2 partition. Reuse the 'fw_env.config' file defined for CC93 for both platforms, and also include CC91 in the process. https://onedigi.atlassian.net/browse/DEL-9119 Signed-off-by: Gonzalo Ruiz --- .../mmc/fw_env.config => mmc/fw_env_boot1_boot2.config} | 0 meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend | 3 +++ 2 files changed, 3 insertions(+) rename meta-digi-arm/recipes-bsp/libubootenv/libubootenv/{ccimx93/mmc/fw_env.config => mmc/fw_env_boot1_boot2.config} (100%) diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/ccimx93/mmc/fw_env.config b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/mmc/fw_env_boot1_boot2.config similarity index 100% rename from meta-digi-arm/recipes-bsp/libubootenv/libubootenv/ccimx93/mmc/fw_env.config rename to meta-digi-arm/recipes-bsp/libubootenv/libubootenv/mmc/fw_env_boot1_boot2.config diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend index 1a2f98766..8f69db3de 100644 --- a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend +++ b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend @@ -15,6 +15,9 @@ FW_CONFIG_FILE:ccmp1 = "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs 'ubi/fw_env.config_default', \ 'ubi/fw_env.config', d)}" +FW_CONFIG_FILE:ccimx9 = "${STORAGE_MEDIA}/fw_env_boot1_boot2.config" +FW_CONFIG_FILE:ccmp2 = "${STORAGE_MEDIA}/fw_env_boot1_boot2.config" + DEPENDS += "${@oe.utils.conditional('OPTEE_PATCHES', '', '', 'optee-client', d)}" OPTEE_PATCHES = ""