Skip to contentSkip to conversation

arm-bsp/u-boot: rebase patches for v2024.01

PATCH Applied Jon Mason 2 participants 2 messages Jan 11, 2024 Arm/versatile express platform

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm-bsp/u-boot: rebase patches for v2024.01

Rebase the fvp-base and juno patches for v2024.01. One patch was upstreamed and thus dropped.

---
 .../recipes-bsp/u-boot/u-boot-fvp-base.inc    |  7 ++-
 ...-vexpress64-Set-the-DM_RNG-property.patch} |  9 ++--
 ...round-for-FVP-returning-zero-size-bu.patch | 49 -------------------
 ...ress64-Select-PSCI-RESET-by-default.patch} | 18 +++----
 ...Imply-CONFIG_ARM64_CRC32-by-default.patch} | 16 +++---
 ...-modify-to-boot-compressed-initramfs.patch |  6 +--
 6 files changed, 21 insertions(+), 84 deletions(-)
 rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/{0002-vexpress64-Set-the-DM_RNG-property.patch => 0001-vexpress64-Set-the-DM_RNG-property.patch} (88%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-virtio-rng-Workaround-for-FVP-returning-zero-size-bu.patch
 rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/{0003-vexpress64-Select-PSCI-RESET-by-default.patch => 0002-vexpress64-Select-PSCI-RESET-by-default.patch} (67%)
 rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/{0004-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch => 0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch} (59%)
meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc +3 -4
index b766181bedea..9aca993f5cbc 100644
@@ -1,8 +1,7 @@
 # FVP base specific U-boot support
 
 SRC_URI:append = " \
-    file://0001-virtio-rng-Workaround-for-FVP-returning-zero-size-bu.patch \
-    file://0002-vexpress64-Set-the-DM_RNG-property.patch \
-    file://0003-vexpress64-Select-PSCI-RESET-by-default.patch \
-    file://0004-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch \
+    file://0001-vexpress64-Set-the-DM_RNG-property.patch \
+    file://0002-vexpress64-Select-PSCI-RESET-by-default.patch \
+    file://0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch \
     "
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch renamed from meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Set-the-DM_RNG-property.patch +3 -6
similarity index 88%
rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Set-the-DM_RNG-property.patch
rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch
index 2f99eaf87cd3..8f053112899e 100644
@@ -1,4 +1,4 @@
-From 9a28caf05b8345cd19276cf7a840599bd9e37749 Mon Sep 17 00:00:00 2001
+From ddb132d10952366c359bdd04482c1a8c0ba08b8f Mon Sep 17 00:00:00 2001
 From: Debbie Martin <[email protected]>
 Date: Fri, 25 Aug 2023 15:09:33 +0100
 Subject: [PATCH] vexpress64: Set the DM_RNG property
@@ -15,7 +15,7 @@ Signed-off-by: Debbie Martin <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
-index cf998096e4..7ae5055f59 100644
+index cf998096e45f..7ae5055f59b1 100644
 --- a/board/armltd/vexpress64/Kconfig
 +++ b/board/armltd/vexpress64/Kconfig
 @@ -21,6 +21,7 @@ config VEXPRESS64_BASE_MODEL
@@ -23,9 +23,6 @@ index cf998096e4..7ae5055f59 100644
  	select LINUX_KERNEL_IMAGE_HEADER
  	select POSITION_INDEPENDENT
 +	imply DM_RNG
-
+ 
  choice
  	prompt "VExpress64 board variant"
---
-2.25.1
-
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-virtio-rng-Workaround-for-FVP-returning-zero-size-bu.patch deleted +0 -49

49 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Select-PSCI-RESET-by-default.patch renamed from meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Select-PSCI-RESET-by-default.patch +6 -12
similarity index 67%
rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Select-PSCI-RESET-by-default.patch
rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Select-PSCI-RESET-by-default.patch
index 9d9a5bdfd1bd..1b00da48212a 100644
@@ -1,12 +1,9 @@
-From 43881e2e9dd165a65791927b1455f4b6c8727f4c Mon Sep 17 00:00:00 2001
-Message-Id: <43881e2e9dd165a65791927b1455f4b6c8727f4c.1696397516.git.diego.sueiro@arm.com>
-In-Reply-To: <98035c418c3df58817ab678037599303842ee931.1696397516.git.diego.sueiro@arm.com>
-References: <98035c418c3df58817ab678037599303842ee931.1696397516.git.diego.sueiro@arm.com>
+From fdf67502a8112bb54cb1d25657cb35a37035f3e9 Mon Sep 17 00:00:00 2001
 From: Diego Sueiro <[email protected]>
 Date: Wed, 4 Oct 2023 06:31:50 +0100
-Subject: [PATCH 2/2] vexpress64: Select PSCI RESET by default
+Subject: [PATCH] vexpress64: Select PSCI RESET by default
 
-Set SYSRESET and SYSRESET_PSCI config for vexpress64 by 
+Set SYSRESET and SYSRESET_PSCI config for vexpress64 by
 by default. This means that the reset_cpu function in
 vexpress64.c is no longer needed because it is called in
 sysreset-uclass.c instead.
@@ -19,10 +16,10 @@ Signed-off-by: Diego Sueiro <[email protected]>
  2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
-index 0d161740fb..0c2e5f8759 100644
+index 7ae5055f59b1..b8aead6cc35c 100644
 --- a/board/armltd/vexpress64/Kconfig
 +++ b/board/armltd/vexpress64/Kconfig
-@@ -31,6 +31,8 @@ config TARGET_VEXPRESS64_BASE_FVP
+@@ -30,6 +30,8 @@ config TARGET_VEXPRESS64_BASE_FVP
  	bool "Support Versatile Express ARMv8a FVP BASE model"
  	select VEXPRESS64_BASE_MODEL
  	imply OF_HAS_PRIOR_STAGE
@@ -32,7 +29,7 @@ index 0d161740fb..0c2e5f8759 100644
  config TARGET_VEXPRESS64_BASER_FVP
  	bool "Support Versatile Express ARMv8r64 FVP BASE model"
 diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
-index ee65a59683..f73de56464 100644
+index ee65a596838a..f73de56464fa 100644
 --- a/board/armltd/vexpress64/vexpress64.c
 +++ b/board/armltd/vexpress64/vexpress64.c
 @@ -207,11 +207,6 @@ void *board_fdt_blob_setup(int *err)
@@ -47,6 +44,3 @@ index ee65a59683..f73de56464 100644
  /*
   * Board specific ethernet initialization routine.
   */
--- 
-2.39.1
-
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch renamed from meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0004-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch +6 -10
similarity index 59%
rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0004-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch
rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch
index 3d10994b60cd..ec3a2a3f61ec 100644
@@ -1,12 +1,11 @@
-From 98035c418c3df58817ab678037599303842ee931 Mon Sep 17 00:00:00 2001
-Message-Id: <98035c418c3df58817ab678037599303842ee931.1696397516.git.diego.sueiro@arm.com>
+From 0b2c98baada9541af1595bb552b7e44d6b79c727 Mon Sep 17 00:00:00 2001
 From: Diego Sueiro <[email protected]>
 Date: Wed, 4 Oct 2023 06:29:12 +0100
-Subject: [PATCH 1/2] vexpress64: Imply CONFIG_ARM64_CRC32 by default
+Subject: [PATCH] vexpress64: Imply CONFIG_ARM64_CRC32 by default
 
-Enable the Arm64 CRC-32 instruction by default for 
-vexpress64. The CRC-32 instruction is a required 
-feature of ARMv8.1 and newer. 
+Enable the Arm64 CRC-32 instruction by default for
+vexpress64. The CRC-32 instruction is a required
+feature of ARMv8.1 and newer.
 
 Upstream-Status: Pending
 Signed-off-by: Diego Sueiro <[email protected]>
@@ -15,7 +14,7 @@ Signed-off-by: Diego Sueiro <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
-index 7ae5055f59..0d161740fb 100644
+index b8aead6cc35c..0c2e5f875950 100644
 --- a/board/armltd/vexpress64/Kconfig
 +++ b/board/armltd/vexpress64/Kconfig
 @@ -22,6 +22,7 @@ config VEXPRESS64_BASE_MODEL
@@ -26,6 +25,3 @@ index 7ae5055f59..0d161740fb 100644
  
  choice
  	prompt "VExpress64 board variant"
--- 
-2.39.1
-
meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch +3 -3
index 0967df76dd87..bd2ed131af7b 100644
@@ -1,4 +1,4 @@
-From 726f8b4dbd3c5b1873aad531d5e26af3acd9b9ca Mon Sep 17 00:00:00 2001
+From 3d266a5d77c908566b1a541f3ff8b717f17a9a8a Mon Sep 17 00:00:00 2001
 From: Jon Mason <[email protected]>
 Date: Mon, 19 Dec 2022 11:36:04 -0500
 Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs
@@ -10,10 +10,10 @@ Upstream-Status: Inappropriate
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
-index 0c11b6b3331e..4ba4bebfbbae 100644
+index 24d8ca086653..0935461340b7 100644
 --- a/include/configs/vexpress_aemv8.h
 +++ b/include/configs/vexpress_aemv8.h
-@@ -192,8 +192,10 @@
+@@ -198,8 +198,10 @@
  #define VEXPRESS_RAMDISK_ADDR		0x8fe00000
  
  #define EXTRA_ENV_NAMES							\
Signature · 1 line
2.39.3 (Apple Git-145)
Applied
#1 lore raw
Quoted 4 lines · Jon Mason

Rebase the fvp-base and juno patches for v2024.01. One patch was upstreamed and thus dropped.

Applied, thanks!

[1/1] arm-bsp/u-boot: rebase patches for v2024.01

      commit: 57124220111285bc6e731985f46da16bb1d20339

Best regards,

Signature · 1 line
Jon Mason <[email protected]>