Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccmp1x: add 'stm32mp15common'/'stm32mp13common' to MACHINEOVERRIDES 

This override sets other variables, such as STM32MP_SOC_NAME which is used
on the build of the FIP image.
It also makes ST layer append a new UBOOT_CONFIG (default_stm32mp15/13)
that we must remove.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-04-14 13:41:44 +02:00
parent e2f1b3cb64
commit e644965b0d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/machine/ccmp13-dvk.conf
View File

@ -12,7 +12,7 @@ DIGI_SOM = "ccmp13"
# Chip architecture # Chip architecture
# ========================================================================= # =========================================================================
DEFAULTTUNE = "cortexa7thf-neon-vfpv4" DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:${DIGI_SOM}:ccmp13-dvk" MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:stm32mp13common:${DIGI_FAMILY}:${DIGI_SOM}:ccmp13-dvk"
# ========================================================================= # =========================================================================
# boot device # boot device
@ -27,6 +27,8 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)
UBOOT_CONFIG = "ccmp13-dvk" UBOOT_CONFIG = "ccmp13-dvk"
UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot.dtb" UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot.dtb"
# Remove STM32mp13 configs from ST layer
UBOOT_CONFIG:remove:stm32mp13common = "default_stm32mp13"
# List of U-Boot device tree to use # List of U-Boot device tree to use
UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}" UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"

4
meta-digi-arm/conf/machine/ccmp15-dvk.conf
View File

@ -12,7 +12,7 @@ DIGI_SOM = "ccmp15"
# Chip architecture # Chip architecture
# ========================================================================= # =========================================================================
DEFAULTTUNE = "cortexa7thf-neon-vfpv4" DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:${DIGI_SOM}:ccmp15-dvk" MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:stm32mp15common:${DIGI_FAMILY}:${DIGI_SOM}:ccmp15-dvk"
# ========================================================================= # =========================================================================
# boot device # boot device
@ -27,6 +27,8 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)
UBOOT_CONFIG = "ccmp15-dvk" UBOOT_CONFIG = "ccmp15-dvk"
UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot.dtb" UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot.dtb"
# Remove STM32mp15 configs from ST layer
UBOOT_CONFIG:remove:stm32mp15common = "default_stm32mp15"
# List of U-Boot device tree to use # List of U-Boot device tree to use
UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}" UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"