Skip to contentSkip to conversation

arm-bsp/u-boot: remove upstreamed fvp-base patches

PATCH Applied Jon Mason 2 participants 2 messages Jan 15 – Jan 16 Arm/versatile express platform

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm-bsp/u-boot: remove upstreamed fvp-base patches

2 of the fvp-base specific u-boot patches were merged in the 2026.01 release. Remove those, as they are no longer necessary.

---
 .../recipes-bsp/u-boot/u-boot-fvp-base.inc    |  8 ---
 ...1-vexpress64-Set-the-DM_RNG-property.patch | 31 --------
 ...64-Enable-SYSRESET-and-SYSRESET_PSCI.patch | 71 -------------------
 3 files changed, 110 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-arm-vexpress64-Enable-SYSRESET-and-SYSRESET_PSCI.patch
meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc +0 -8
index 44b98f8fca7e..a52837218f9b 100644
@@ -2,13 +2,5 @@
 
 SRC_URI:append = " \
     file://virtio-boot.cfg \
-    file://0001-vexpress64-Set-the-DM_RNG-property.patch \
-    file://0002-arm-vexpress64-Enable-SYSRESET-and-SYSRESET_PSCI.patch \
     file://0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch \
     "
-
-# Remove backported patches from latest version
-SRC_URI:remove:class-devupstream = " \
-    file://0001-vexpress64-Set-the-DM_RNG-property.patch \
-    file://0002-arm-vexpress64-Enable-SYSRESET-and-SYSRESET_PSCI.patch \
-    "
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch deleted +0 -31
deleted file mode 100644
index dee48e1dd68c..000000000000
@@ -1,31 +0,0 @@
-From 364d81afbf4fdc1b3d35c137f02ffa6f1ddd929d Mon Sep 17 00:00:00 2001
-From: Debbie Horsfall <[email protected]>
-Date: Wed, 17 Sep 2025 17:22:21 +0100
-Subject: [PATCH] vexpress64: Set the DM_RNG property
-
-Enable the DM_RNG virtio random number generator driver in order to
-consume entropy within U-Boot. This allows U-Boot to inject entropy to the
-kernel via UEFI, so the kernel can use that early, for instance for
-address layout randomisation, or when the kernel does not provide an
-entropy driver itself.
-
-Signed-off-by: Debbie Horsfall <[email protected]>
-Reviewed-by: Andre Przywara <[email protected]>
-Upstream-Status: Backport [2767386806c254820ea22a812bb02e5405495a29]
----
- board/armltd/vexpress64/Kconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
-index 7e8709444fe3..610ab0ac37dc 100644
---- a/board/armltd/vexpress64/Kconfig
-+++ b/board/armltd/vexpress64/Kconfig
-@@ -21,6 +21,8 @@ config VEXPRESS64_BASE_MODEL
- 	imply EFI_SET_TIME if DM_RTC
- 	select LINUX_KERNEL_IMAGE_HEADER
- 	select POSITION_INDEPENDENT
-+	imply DM_RNG
-+	imply RNG_ARM_RNDR
- 
- choice
- 	prompt "VExpress64 board variant"
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-arm-vexpress64-Enable-SYSRESET-and-SYSRESET_PSCI.patch deleted +0 -71

71 lines not on this page · raw message

Signature · 1 line
2.50.1 (Apple Git-155)
Applied
#1 lore raw
Quoted 4 lines · Jon Mason

2 of the fvp-base specific u-boot patches were merged in the 2026.01 release. Remove those, as they are no longer necessary.

Applied, thanks!

[1/1] arm-bsp/u-boot: remove upstreamed fvp-base patches

      commit: 755287ed334e64576b653296b11afd004a5e275e

Best regards,

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