From 2db49f3a4a342d3059e5a925b9455ecd0cc40079 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 2 Dec 2024 12:30:16 +0100 Subject: [PATCH] ccmp25-dvk: sync default FIP generation variables This commit updates the default FIP generation variables to align with the common stm32mp2 configuration files from the latest meta-st-stm32mp layer, based on the openstlinux-6.6-yocto-scarthgap-mpu-v24.11.06 tag for Yocto 5.0 (Scarthgap). https://onedigi.atlassian.net/browse/DEL-9381 Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 16 ++++++++-------- meta-digi-arm/conf/machine/include/ccmp2.inc | 9 +++++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 0044a8b9f..889df6564 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -10,11 +10,6 @@ include conf/machine/include/ccmp2.inc DIGI_SOM = "ccmp25" MACHINEOVERRIDES =. "stm32mp2common:stm32mp25common:${DIGI_FAMILY}:${DIGI_SOM}:" -# ========================================================================= -# SOC -# ========================================================================= -STM32MP_SOC_NAME = "stm32mp25" - # ========================================================================= # Chip architecture # ========================================================================= @@ -31,15 +26,20 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard # ========================================================================= # U-Boot configs # ========================================================================= +# Remove STM32mp25 configs from ST layer +UBOOT_CONFIG:remove:stm32mp25common = " default_stm32mp25 " # Last one is the default (the one the symlinks point at) UBOOT_CONFIG = "ccmp25-dvk" -UBOOT_CONFIG[ccmp25-dvk] = "ccmp25-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" +UBOOT_CONFIG[ccmp25-dvk] = "ccmp25-dvk_defconfig,,u-boot.dtb" +# List of U-Boot device tree to use +UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}" # ========================================================================= # Machine settings # ========================================================================= # Define list of devicetree per supported storage -STM32MP_DEVICETREE ??= "ccmp25-dvk" +STM32MP_DT_FILES_EMMC = "ccmp25-dvk" + # Extra DTB for board - need to specify it with .dtb ... STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ ccmp25-dvk.dtb \ @@ -61,7 +61,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ # optee # ========================================================================= # Map OPTEE configuration to device tree list -OPTEE_CONF = "${STM32MP_DEVICETREE}" +OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" # ========================================================================= # Machine features diff --git a/meta-digi-arm/conf/machine/include/ccmp2.inc b/meta-digi-arm/conf/machine/include/ccmp2.inc index 31b112834..900fb862b 100644 --- a/meta-digi-arm/conf/machine/include/ccmp2.inc +++ b/meta-digi-arm/conf/machine/include/ccmp2.inc @@ -18,8 +18,10 @@ FIP_UBOOT_DTB = "u-boot" # ========================================================================= PREFERRED_PROVIDER_virtual/trusted-firmware-a = "tf-a-stm32mp" -# Configure use of BL31 -FIP_BL31_ENABLE = "1" +# Set metadata settings +DEVICE_PARTUUID_FIP_A = "1c606ef5-f1ac-43b9-9bb5-d5c578580b6b" +DEVICE_PARTUUID_FIP_B = "c7d8648b-76f7-4e2b-b829-e95a83cc7b32" +TF_A_METADATA_TOOL_ARGS ?= "-g -i 1 -b 2 -v ${TF_A_METADATA_TOOL_VERSION} ${DEVICE_PARTUUID_FWU_MDATA},${DEVICE_TYPEUUID_FIP},${DEVICE_PARTUUID_FIP_A},${DEVICE_PARTUUID_FIP_B}" # ========================================================================= # optee-os @@ -48,6 +50,9 @@ ROOTFS_DEV_NAME ?= "/dev/mmcblk0p8" ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs" ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}" +# Disable by default programmer support: +STM32MP_DEVICETREE_PROGRAMMER_ENABLE ?= "0" + # List of supported boot devices BOOTDEVICE_LABELS ?= "emmc" # Supported boot schemes