[PATCH] arm-bsp/u-boot: update patches for v2025.07
Jon Mason <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
Update the FVP base u-boot patches to apply cleanly to u-boot v2025.07. Also, use a config fragment to change the default boot command to boot virtio image. This works around some changes in include/configs/vexpress_aemv8.h that change the boot behavior, which is not something we're using anyway. Signed-off-by: Jon Mason <[email protected]> --- meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc | 1 + .../0001-vexpress64-Set-the-DM_RNG-property.patch | 4 ++-- ...002-vexpress64-Select-PSCI-RESET-by-default.patch | 12 ++++++------ ...press64-Imply-CONFIG_ARM64_CRC32-by-default.patch | 4 ++-- .../u-boot/u-boot/fvp-base/virtio-boot.cfg | 1 + ...express-modify-to-boot-compressed-initramfs.patch | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/virtio-boot.cfg diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc index 9aca993f5cbc..d7558f4ff456 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc @@ -1,6 +1,7 @@ # FVP base specific U-boot support SRC_URI:append = " \ + file://virtio-boot.cfg \ 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 \ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch index 8f053112899e..4912491fb68a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch @@ -1,4 +1,4 @@ -From ddb132d10952366c359bdd04482c1a8c0ba08b8f Mon Sep 17 00:00:00 2001 +From 6813b56a11f423f3faa0e960bb044534e11d0104 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 cf998096e45f..7ae5055f59b1 100644 +index 7e8709444fe3..f413c51ac43b 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -21,6 +21,7 @@ config VEXPRESS64_BASE_MODEL diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Select-PSCI-RESET-by-default.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Select-PSCI-RESET-by-default.patch index 1b00da48212a..822a308dd29a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Select-PSCI-RESET-by-default.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0002-vexpress64-Select-PSCI-RESET-by-default.patch @@ -1,4 +1,4 @@ -From fdf67502a8112bb54cb1d25657cb35a37035f3e9 Mon Sep 17 00:00:00 2001 +From ca70595913d7584605be1ea37362da25254fb829 Mon Sep 17 00:00:00 2001 From: Diego Sueiro <[email protected]> Date: Wed, 4 Oct 2023 06:31:50 +0100 Subject: [PATCH] vexpress64: Select PSCI RESET by default @@ -16,24 +16,24 @@ 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 7ae5055f59b1..b8aead6cc35c 100644 +index f413c51ac43b..d0733ba62432 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -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 + imply OF_HAS_PRIOR_STAGE if !BLOBLIST + select SYSRESET + select SYSRESET_PSCI 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 ee65a596838a..f73de56464fa 100644 +index 0b75c1358f0b..e8f1c2fe9fe2 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c -@@ -207,11 +207,6 @@ void *board_fdt_blob_setup(int *err) - } +@@ -206,11 +206,6 @@ int board_fdt_blob_setup(void **fdtp) + #endif #endif -/* Actual reset is done via PSCI. */ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch index ec3a2a3f61ec..5ebdda095dd4 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch @@ -1,4 +1,4 @@ -From 0b2c98baada9541af1595bb552b7e44d6b79c727 Mon Sep 17 00:00:00 2001 +From 9c98333d7c5f4c2611c76d60f5e7cb96bfdaca26 Mon Sep 17 00:00:00 2001 From: Diego Sueiro <[email protected]> Date: Wed, 4 Oct 2023 06:29:12 +0100 Subject: [PATCH] vexpress64: Imply CONFIG_ARM64_CRC32 by default @@ -14,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 b8aead6cc35c..0c2e5f875950 100644 +index d0733ba62432..543cbdb5631b 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -22,6 +22,7 @@ config VEXPRESS64_BASE_MODEL diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/virtio-boot.cfg b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/virtio-boot.cfg new file mode 100644 index 000000000000..4d7763653200 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/virtio-boot.cfg @@ -0,0 +1 @@ +CONFIG_BOOTCOMMAND="run virtio_boot" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch index bd2ed131af7b..7000d9131d62 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch @@ -1,4 +1,4 @@ -From 3d266a5d77c908566b1a541f3ff8b717f17a9a8a Mon Sep 17 00:00:00 2001 +From ddf8928e53830ddce9dc5383143dcab75b4a4cfb 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 24d8ca086653..0935461340b7 100644 +index 5eee13b3fc01..82dff260c30c 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h -@@ -198,8 +198,10 @@ +@@ -213,8 +213,10 @@ #define VEXPRESS_RAMDISK_ADDR 0x8fe00000 #define EXTRA_ENV_NAMES \ -- 2.39.5 (Apple Git-154)