From 7ceebfbb1e24d06bf1914e216a2f2550b7bba32f Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 10 Apr 2025 13:55:56 +0200 Subject: [PATCH] ccmp1: adapt U-Boot and OPTEE variables to newest ST BSP Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 4 ++-- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 6cbcbbb32..54fce1d0e 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -26,7 +26,7 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard # ========================================================================= # Last one is the default (the one the symlinks point at) UBOOT_CONFIG = "ccmp13-dvk" -UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" +UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot.dtb" # ========================================================================= # Machine settings @@ -108,7 +108,7 @@ ST_DEBUG_TRACE = "0" # optee # ========================================================================= # Map OPTEE configuration to device tree list -OPTEE_CONF = "${STM32MP_DEVICETREE}" +OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" # ========================================================================= # Flashlayouts diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 351aad17f..aa89aab05 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -26,7 +26,7 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard # ========================================================================= # Last one is the default (the one the symlinks point at) UBOOT_CONFIG = "ccmp15-dvk" -UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" +UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot.dtb" # ========================================================================= # Machine settings @@ -122,7 +122,7 @@ ST_DEBUG_TRACE = "0" # optee # ========================================================================= # Map OPTEE configuration to device tree list -OPTEE_CONF = "${STM32MP_DEVICETREE}" +OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" # ========================================================================= # Flashlayouts