mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/u-boot: Update fvp-base, juno, corstone1000 patches

Browse Source 
Fuzz detected when applying patch.  Use devtool to update and clean-up
the relevant patches.

Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2026-05-01 09:28:22 -04:00
parent 3aa085566e
commit f3a2db0561
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-OF_UPSTREAM-device-tree-support.patch
+3 -4
View File
@@ -1,4 +1,4 @@
From e070ae0f02b10bfd482146a748095ca782f73039 Mon Sep 17 00:00:00 2001 From e1b46cabacd2bbbde5ac42a01af21126788f274e Mon Sep 17 00:00:00 2001
From: Frazer Carsley <frazer.carsley@arm.com> From: Frazer Carsley <frazer.carsley@arm.com>
Date: Mon, 19 Jan 2026 15:16:52 +0000 Date: Mon, 19 Jan 2026 15:16:52 +0000
Subject: [PATCH] corstone1000: enable OF_UPSTREAM device tree support Subject: [PATCH] corstone1000: enable OF_UPSTREAM device tree support
@@ -502,7 +502,7 @@ index 1b9c3a9ed16..db8919298e1 100644
if (!virtio_bus) { if (!virtio_bus) {
log_err("Cannot find virtio device, err (%d)\n", ret); log_err("Cannot find virtio device, err (%d)\n", ret);
diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig
index 450d69762ab..350607892fa 100644 index 4ec23b4af1c..6ff855e7ce9 100644
--- a/configs/corstone1000_defconfig --- a/configs/corstone1000_defconfig
+++ b/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig
@@ -7,7 +7,7 @@ CONFIG_NR_DRAM_BANKS=1 @@ -7,7 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
@@ -514,7 +514,7 @@ index 450d69762ab..350607892fa 100644
CONFIG_SYS_BOOTM_LEN=0x800000 CONFIG_SYS_BOOTM_LEN=0x800000
CONFIG_SYS_LOAD_ADDR=0x82100000 CONFIG_SYS_LOAD_ADDR=0x82100000
CONFIG_IDENT_STRING=" corstone1000 aarch64 " CONFIG_IDENT_STRING=" corstone1000 aarch64 "
@@ -55,6 +55,9 @@ CONFIG_CMD_RTC=y @@ -56,6 +56,9 @@ CONFIG_CMD_RTC=y
CONFIG_CMD_TIME=y CONFIG_CMD_TIME=y
CONFIG_CMD_GETTIME=y CONFIG_CMD_GETTIME=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
@@ -524,4 +524,3 @@ index 450d69762ab..350607892fa 100644
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_REGMAP=y CONFIG_REGMAP=y
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-dts-use-32-bit-cells-for-reserved-memor.patch
+2 -4
View File
@@ -1,8 +1,7 @@
From df01111a866a37fcf875b3c2e2394414d27c89da Mon Sep 17 00:00:00 2001 From dd4db190281802141c4c787a9869f8153d93b1a4 Mon Sep 17 00:00:00 2001
From: Harsimran Singh Tungal <harsimransingh.tungal@arm.com> From: Harsimran Singh Tungal <harsimransingh.tungal@arm.com>
Date: Wed, 24 Sep 2025 13:42:25 +0000 Date: Wed, 24 Sep 2025 13:42:25 +0000
Subject: [PATCH] corstone1000: dts: use 32-bit cells for Subject: [PATCH] corstone1000: dts: use 32-bit cells for /reserved-memory node
/reserved-memory node
Switch the *reserved-memory* node from two-cell (64-bit) encoding to Switch the *reserved-memory* node from two-cell (64-bit) encoding to
one-cell (32-bit) encoding and adjust the `reg` property accordingly one-cell (32-bit) encoding and adjust the `reg` property accordingly
@@ -34,4 +33,3 @@ index a75bc7016aa..4ea6f1d9724 100644
no-map; no-map;
}; };
}; };
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-a320-Add-Corstone1000-board-variant.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From da23886f3b38812c60a4597db129ab96df74bb99 Mon Sep 17 00:00:00 2001 From 9b0a2622667bfe5794c77161d973d6f59871668c Mon Sep 17 00:00:00 2001
From: Frazer Carsley <frazer.carsley@arm.com> From: Frazer Carsley <frazer.carsley@arm.com>
Date: Wed, 25 Feb 2026 14:28:08 +0000 Date: Wed, 25 Feb 2026 14:28:08 +0000
Subject: [PATCH] corstone1000-a320: Add Corstone1000 board variant Subject: [PATCH] corstone1000-a320: Add Corstone1000 board variant
@@ -400,7 +400,7 @@ index 00000000000..e62978b487e
+F: board/armltd/corstone1000-a320/ +F: board/armltd/corstone1000-a320/
+F: configs/corstone1000-a320_defconfig +F: configs/corstone1000-a320_defconfig
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
index db8919298e1..2f65eac7bf4 100644 index db8919298e1..fe6929e94e0 100644
--- a/board/armltd/corstone1000/corstone1000.c --- a/board/armltd/corstone1000/corstone1000.c
+++ b/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch
+5 -5
View File
@@ -1,4 +1,4 @@
From 67b2bcd428a13d14d4311bd1122e664f391af4d4 Mon Sep 17 00:00:00 2001 From 469d6ae6f7f0e6356457a50ab490b56e423e4e50 Mon Sep 17 00:00:00 2001
From: Diego Sueiro <diego.sueiro@arm.com> From: Diego Sueiro <diego.sueiro@arm.com>
Date: Wed, 4 Oct 2023 06:29:12 +0100 Date: Wed, 4 Oct 2023 06:29:12 +0100
Subject: [PATCH] vexpress64: Imply CONFIG_ARM64_CRC32 by default Subject: [PATCH] vexpress64: Imply CONFIG_ARM64_CRC32 by default
@@ -15,7 +15,7 @@ Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
2 files changed, 8 insertions(+), 6 deletions(-) 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index 9ef3fa1b379f..1a0e0a5018d8 100644 index 9ef3fa1b379..1a0e0a5018d 100644
--- a/board/armltd/vexpress64/Kconfig --- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig
@@ -24,6 +24,7 @@ config VEXPRESS64_BASE_MODEL @@ -24,6 +24,7 @@ config VEXPRESS64_BASE_MODEL
@@ -27,7 +27,7 @@ index 9ef3fa1b379f..1a0e0a5018d8 100644
choice choice
prompt "VExpress64 board variant" prompt "VExpress64 board variant"
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 5eee13b3fc01..5c271d239501 100644 index fc4727b4a38..01310ca0454 100644
--- a/include/configs/vexpress_aemv8.h --- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
@@ -39,9 +39,9 @@ index 5eee13b3fc01..5c271d239501 100644
" setenv bootargs;" \ " setenv bootargs;" \
" abootimg addr ${boot_addr_r};" \ " abootimg addr ${boot_addr_r};" \
" abootimg get dtb --index=0 fdt_addr_r;" \ " abootimg get dtb --index=0 fdt_addr_r;" \
@@ -181,13 +181,14 @@ @@ -180,13 +180,14 @@
"else" \
" if load hostfs - ${kernel_addr_r} ${kernel_name}; then" \ " if load hostfs - ${kernel_addr_r} ${kernel_name}; then" \
" setenv fdt_high 0xffffffffffffffff;" \
" setenv initrd_high 0xffffffffffffffff;" \ " setenv initrd_high 0xffffffffffffffff;" \
- " if test -n load hostfs - ${fdt_addr_r} ${fdtfile}; then" \ - " if test -n load hostfs - ${fdt_addr_r} ${fdtfile}; then" \
- " fdt move $fdtcontroladdr $fdt_addr_r;" \ - " fdt move $fdtcontroladdr $fdt_addr_r;" \
meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From ddf8928e53830ddce9dc5383143dcab75b4a4cfb Mon Sep 17 00:00:00 2001 From 9622b33133ddcd2da42fe41a6e5e52d7c7d5ccf8 Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@kudzu.us> From: Jon Mason <jdmason@kudzu.us>
Date: Mon, 19 Dec 2022 11:36:04 -0500 Date: Mon, 19 Dec 2022 11:36:04 -0500
Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs
@@ -10,10 +10,10 @@ Upstream-Status: Inappropriate
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 5eee13b3fc01..82dff260c30c 100644 index fc4727b4a38..2c83189923f 100644
--- a/include/configs/vexpress_aemv8.h --- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h
@@ -213,8 +213,10 @@ @@ -212,8 +212,10 @@
#define VEXPRESS_RAMDISK_ADDR 0x8fe00000 #define VEXPRESS_RAMDISK_ADDR 0x8fe00000
#define EXTRA_ENV_NAMES \ #define EXTRA_ENV_NAMES \