From b8f8174579da162d66de9bf01a11ec7b729d5c22 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 3 Nov 2022 14:51:01 +0100 Subject: [PATCH] ccmp1: define DIGI_FAMILY variable DIGI_FAMILY is "ccmp1" and is common to both CCMP15 and CCMP13. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 2 +- meta-digi-arm/conf/machine/include/ccmp1.inc | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index e87a1341a..231012abe 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -10,7 +10,7 @@ include conf/machine/include/ccmp1.inc # Chip architecture # ========================================================================= DEFAULTTUNE = "cortexa7thf-neon-vfpv4" -MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:ccmp1:ccmp13:ccmp13-dvk" +MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:ccmp13:ccmp13-dvk" # ========================================================================= # boot device diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 659eb31b8..97717efc2 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -10,7 +10,7 @@ include conf/machine/include/ccmp1.inc # Chip architecture # ========================================================================= DEFAULTTUNE = "cortexa7thf-neon-vfpv4" -MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:ccmp1:ccmp15:ccmp15-dvk" +MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:ccmp15:ccmp15-dvk" # ========================================================================= # boot device diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 16e572123..3b2a60e83 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -6,6 +6,8 @@ include conf/machine/include/st-machine-common-stm32mp.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/digi-defaults.inc +DIGI_FAMILY = "ccmp1" + # Platform u-boot settings UBOOT_PREFIX = "u-boot" UBOOT_SUFFIX = "bin"