From 797e43e09b63002429499820d6248c17b8483d05 Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Wed, 5 Oct 2022 11:03:15 +0100 Subject: [PATCH] arm-bsp/corstone500: upgrade kernel to v5.19 This change is to upgrade kernel to 5.19 for corstone500 target Signed-off-by: Vishnu Banavath Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- ...op-CONFIG_SND_SOC_AC97-from-multi_v7.patch | 30 +++++++++++++++++++ .../linux/linux-arm-platforms.inc | 4 +++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-arm-bsp/recipes-kernel/linux/files/corstone500/0001-arm-defconfig-drop-CONFIG_SND_SOC_AC97-from-multi_v7.patch diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index adcfddd0..9db2ceb0 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -12,7 +12,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa5.inc # apply. # PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "5.19%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone500/0001-arm-defconfig-drop-CONFIG_SND_SOC_AC97-from-multi_v7.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone500/0001-arm-defconfig-drop-CONFIG_SND_SOC_AC97-from-multi_v7.patch new file mode 100644 index 00000000..68c9ca00 --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/files/corstone500/0001-arm-defconfig-drop-CONFIG_SND_SOC_AC97-from-multi_v7.patch @@ -0,0 +1,30 @@ +Upstream-Status: Pending [Not submitted to upstream yet] +Signed-off-by: Vishnu Banavath + +From 7ee0e1c0a6498d376b38679c908f01a1528a1450 Mon Sep 17 00:00:00 2001 +From: Vishnu Banavath +Date: Thu, 29 Sep 2022 17:16:45 +0100 +Subject: [PATCH] arm: defconfig: drop CONFIG_SND_SOC_AC97 from + multi_v7_defconfig + +The CONFIG_SND_SOC_AC97 symbol was recently enabled but does not +actually exist. This change is to remove it to fix warnings when +used some of the build tools like yocto. + +Signed-off-by: Vishnu Banavath + +diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig +index ce9826bce29b..b3662f126efa 100644 +--- a/arch/arm/configs/multi_v7_defconfig ++++ b/arch/arm/configs/multi_v7_defconfig +@@ -817,7 +817,6 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m + CONFIG_SND_SOC_TEGRA_ALC5632=m + CONFIG_SND_SOC_TEGRA_MAX98090=m + CONFIG_SND_SOC_DAVINCI_MCASP=m +-CONFIG_SND_SOC_AC97=m + CONFIG_SND_SOC_AK4642=m + CONFIG_SND_SOC_CPCAP=m + CONFIG_SND_SOC_CS42L51_I2C=m +-- +2.17.1 + diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 70d09a01..dec75fa5 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -27,6 +27,10 @@ SRCREV:arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" COMPATIBLE_MACHINE:corstone500 = "corstone500" KBUILD_DEFCONFIG:corstone500 = "multi_v7_defconfig" KCONFIG_MODE:corstone500 = "--alldefconfig" +FILESEXTRAPATHS:prepend:corstone500 := "${ARMBSPFILESPATHS}" +SRC_URI:append:corstone500 = " \ + file://0001-arm-defconfig-drop-CONFIG_SND_SOC_AC97-from-multi_v7.patch \ + " # # Corstone1000 KMACHINE