From 894a28de64674242a4c77469e9faa00d1e892aad Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Wed, 6 Sep 2023 16:28:04 +0200 Subject: [PATCH] ccmp1: add weak assignment for KERNEL_EXTERNAL_DEFCONFIG Digi's mechanism to use a custom Linux kernel defconfig is based on setting the variable KERNEL_DEFCONFIG, however ST implements their own mechanism with a custom variable KERNEL_EXTERNAL_DEFCONFIG. When providing an external defconfig, the variable needs to be set, otherwise a build error will be generated. So to keep compatibility with NXP platforms, this commit weakly assigns KERNEL_EXTERNAL_DEFCONFIG to a default value "defconfig". Signed-off-by: Francisco Gil --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 1 + meta-digi-arm/conf/machine/ccmp15-dvk.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index b059de59f..4dd893eb1 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -114,6 +114,7 @@ OPTEE_CONF = "ccmp13-dvk" KERNEL_IMAGETYPE = "zImage" KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux" KERNEL_DEFCONFIG ?= "ccmp1_defconfig" +KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig" ST_KERNEL_LOADADDR ?= "0xC0008000" # ========================================================================= diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 9dbf070c0..55636af86 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -122,6 +122,7 @@ OPTEE_CONF = "ccmp15-dvk" KERNEL_IMAGETYPE = "zImage" KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux" KERNEL_DEFCONFIG ?= "ccmp1_defconfig" +KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig" ST_KERNEL_LOADADDR ?= "0xC0008000" # =========================================================================