From 03574e91737c8374c9dcf3674c17636c9fb1fbb6 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Thu, 2 Feb 2023 09:54:55 +0000 Subject: [PATCH] arm-bsp: corstone500: bump kernel version to 6.1 Bump corstone500 kernel version to 6.1 and drop the not longer needed patch regarding the SND_SOC_AC97 config option in multi_v7. Signed-off-by: Rui Miguel Silva Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index 2642ec71..a599660c 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.19%" +PREFERRED_VERSION_linux-yocto ?= "6.1%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" 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 e2a36c9b..96873c90 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -27,10 +27,6 @@ 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