diff mbox series

[1/3] arm-bsp/fvp-base-arm32: Update kernel patch for v5.19

Message ID 20220811134236.3502-1-jon.mason@arm.com
State New
Headers show
Series [1/3] arm-bsp/fvp-base-arm32: Update kernel patch for v5.19 | expand

Commit Message

Jon Mason Aug. 11, 2022, 1:42 p.m. UTC 
In newer kernels, vexpress has been rolled under the versatile umbrella.
Update the patch to refer to the new location

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../0001-ARM-vexpress-enable-GICv3.patch      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Comments

Jon Mason Aug. 15, 2022, 1:35 a.m. UTC | #1 
On Thu, 11 Aug 2022 09:42:34 -0400, Jon Mason wrote:
> In newer kernels, vexpress has been rolled under the versatile umbrella.
> Update the patch to refer to the new location

Applied, thanks!

[1/3] arm-bsp/fvp-base-arm32: Update kernel patch for v5.19
      commit: 7617120602755051ce45c6837cd8f26fb3254ef0
[2/3] arm/qemuarm64-secureboot: remove tfa memory patch
      commit: 2a92d6294d349303969b12698a151689d69fb0b6
[3/3] arm/linux-yocto: remove optee num pages kernel config variable
      commit: 769a09da7c6566db942138baae177bc95a1faa94

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch b/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch
index d0a05c24..184a7631 100644
--- a/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch
+++ b/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch
@@ -1,4 +1,4 @@ 
-From 5dbb6c4267b1e46ed08359be363d8bc9b6a79397 Mon Sep 17 00:00:00 2001
+From 9fe529a146f4528ec80a3d04588e387f3651dc22 Mon Sep 17 00:00:00 2001
 From: Ryan Harkin <ryan.harkin@linaro.org>
 Date: Wed, 16 Nov 2016 14:43:02 +0000
 Subject: [PATCH] ARM: vexpress: enable GICv3
@@ -11,21 +11,21 @@  ARMv7 kernel.  And these targets often contain GICv3.
 Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
 Signed-off-by: Jon Medhurst <tixy@linaro.org>
 ---
- arch/arm/mach-vexpress/Kconfig | 1 +
+ arch/arm/mach-versatile/Kconfig | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
-index 7c728ebc0b33..ed579382d41f 100644
---- a/arch/arm/mach-vexpress/Kconfig
-+++ b/arch/arm/mach-vexpress/Kconfig
-@@ -4,6 +4,7 @@ menuconfig ARCH_VEXPRESS
- 	select ARCH_SUPPORTS_BIG_ENDIAN
+diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
+index 2ef226194c3a..3d54877fe339 100644
+--- a/arch/arm/mach-versatile/Kconfig
++++ b/arch/arm/mach-versatile/Kconfig
+@@ -251,6 +251,7 @@ menuconfig ARCH_VEXPRESS
+ 	depends on ARCH_MULTI_V7
  	select ARM_AMBA
  	select ARM_GIC
 +	select ARM_GIC_V3
  	select ARM_GLOBAL_TIMER
  	select ARM_TIMER_SP804
- 	select COMMON_CLK_VERSATILE
+ 	select GPIOLIB
 -- 
-2.17.1
+2.30.2