From 1df9bebacf6df8f58817408ae94d62159d691c9c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 10 Nov 2020 15:52:13 +0000 Subject: [PATCH] arm-bsp/linux-stable: move corstone700 tweaks to versioned bbappend The corstone700-specific tweaks should be applied to just the 5.6 version of the linux-stable recipe, not all of them. By appending all of the versions they *all* become 5.6.14, which makes it impossible to know what recipe is actually being used. Change-Id: I77ccc1f16003fea7b6356732587c6947b20a2f4c Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend | 8 -------- .../recipes-kernel/linux/linux-stable_5.6%.bbappend | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend index e4b2c117..db850eab 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend +++ b/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend @@ -1,11 +1,3 @@ # Add support for Arm Platforms (boards or simulators) require linux-arm-platforms.inc - -# -# Corstone700 KMACHINE -# -MACHINE_KERNEL_REQUIRE ?= "" -MACHINE_KERNEL_REQUIRE_corstone700 = "linux-stable-corstone700.inc" - -require ${MACHINE_KERNEL_REQUIRE} diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend new file mode 100644 index 00000000..3793fad3 --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend @@ -0,0 +1,7 @@ +# +# Corstone700 KMACHINE +# +MACHINE_KERNEL_REQUIRE ?= "" +MACHINE_KERNEL_REQUIRE_corstone700 = "linux-stable-corstone700.inc" + +require ${MACHINE_KERNEL_REQUIRE}