mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-06 14:50:03 +00:00
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2026-01-15 17:45:37 -05:00
parent f36c9add46
commit 755287ed33
3 changed files with 0 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc
-8
View File
@@ -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
-31
View File
@@ -1,31 +0,0 @@
From 364d81afbf4fdc1b3d35c137f02ffa6f1ddd929d Mon Sep 17 00:00:00 2001
From: Debbie Horsfall <debbie.horsfall@arm.com>
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 <debbie.horsfall@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
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
-71
View File
@@ -1,71 +0,0 @@
From bec13f424612ba01dace86fe4a4ab49eedaca4b2 Mon Sep 17 00:00:00 2001
From: Debbie Horsfall <debbie.horsfall@arm.com>
Date: Wed, 17 Sep 2025 17:22:22 +0100
Subject: [PATCH] arm: vexpress64: Enable SYSRESET and SYSRESET_PSCI
Select SYSRESET on Vexpress64 to enable system reset to support other
features, such as capsule-on-disk. Select SYSRESET_PSCI if PSCI is
inferred from the firmware (via ARM_PSCI_FW).
Select ARM_SMCCC for Vexpress64 boards which in turn selects
ARM_PSCI_FW.
The sysreset uclass unconditionally implements a reset_cpu() function.
Remove the empty reset_cpu() in vexpress64 board code.
Signed-off-by: Debbie Horsfall <debbie.horsfall@arm.com>
Upstream-Status: Backport [1f3f1e090a2695e0b17cbf9dc50ccb59d100458f]
---
arch/arm/Kconfig | 2 ++
board/armltd/vexpress64/Kconfig | 2 ++
board/armltd/vexpress64/vexpress64.c | 5 -----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 625d2e995d2f..68f37f633fdf 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1418,6 +1418,8 @@ config ARCH_VEXPRESS64
select MTD_NOR_FLASH if MTD
select FLASH_CFI_DRIVER if MTD
select ENV_IS_IN_FLASH if MTD
+ select SYSRESET
+ select SYSRESET_PSCI if ARM_PSCI_FW
imply DISTRO_DEFAULTS
config TARGET_CORSTONE1000
diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index 610ab0ac37dc..9ef3fa1b379f 100644
--- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig
@@ -23,6 +23,7 @@ config VEXPRESS64_BASE_MODEL
select POSITION_INDEPENDENT
imply DM_RNG
imply RNG_ARM_RNDR
+ select ARM_SMCCC
choice
prompt "VExpress64 board variant"
@@ -48,6 +49,7 @@ config TARGET_VEXPRESS64_JUNO
select USB_EHCI_GENERIC if USB
select USB_OHCI_HCD if USB
select USB_OHCI_GENERIC if USB
+ select ARM_SMCCC
imply OF_HAS_PRIOR_STAGE
endchoice
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 0b75c1358f0b..e8f1c2fe9fe2 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -206,11 +206,6 @@ int board_fdt_blob_setup(void **fdtp)
#endif
#endif
-/* Actual reset is done via PSCI. */
-void reset_cpu(void)
-{
-}
-
/*
* Board specific ethernet initialization routine.
*/