Revert "booti/bootm: riscv: Verify image arch type"
PATCH 1/1 Revert "booti/bootm: riscv: Verify image arch type"
This reverts commit 37b0b22d8b7bbed6aa95b6daed06dcbf4a66f211 as discussed in [1].
[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
--- arch/riscv/lib/bootm.c | 4 ---- cmd/booti.c | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-)
arch/riscv/lib/bootm.c +0 -4
@@ -90,10 +90,6 @@ static void boot_jump_linux(struct bootm_headers *images, int flag)announce_and_cleanup (fake);if (!fake) { -if (images->os.arch !=IH_ARCH_DEFAULT ) { -printf ("Image arch not compatible with host arch.\n" ); -hang (); - }if (CONFIG_IS_ENABLED (OF_LIBFDT ) && images->ft_len) {#ifdef CONFIG_SMP ret = smp_call_function(images->ep,
cmd/booti.c +2 -5
@@ -130,11 +130,8 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])bootm_disable_interrupts (); images.os.os =IH_OS_LINUX ; -if (IS_ENABLED (CONFIG_RISCV )) -if (IS_ENABLED (CONFIG_64BIT )) - images.os.arch =IH_ARCH_RISCV64 ; -else - images.os.arch =IH_ARCH_RISCV ; +if (IS_ENABLED (CONFIG_RISCV_SMODE )) + images.os.arch =IH_ARCH_RISCV ;else if (IS_ENABLED (CONFIG_ARM64 )) images.os.arch =IH_ARCH_ARM64 ;
Signature · 1 line
2.43.0
PATCH 1/1 Revert "riscv: Select appropriate image type"
This reverts commit 027a316828528da95a77d20632370b1bc2823f0b as discussed in [1].
[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
--- arch/riscv/dts/binman.dtsi | 14 ++++---------- arch/riscv/include/asm/u-boot.h | 4 ---- 2 files changed, 4 insertions(+), 14 deletions(-)
arch/riscv/dts/binman.dtsi +4 -10
@@ -5,12 +5,6 @@ #include <config.h> -#ifdef CONFIG_64BIT -#define ARCH "riscv64" -#else -#define ARCH "riscv" - -#endif / { binman: binman { multiple-images;
@@ -37,7 +31,7 @@ description = "U-Boot"; type = "standalone"; os = "U-Boot"; - arch = ARCH; + arch = "riscv"; compression = "none"; load = /bits/ 64 <CONFIG_TEXT_BASE>;
@@ -49,7 +43,7 @@ description = "Linux"; type = "standalone"; os = "Linux"; - arch = ARCH; + arch = "riscv"; compression = "none"; load = /bits/ 64 <CONFIG_TEXT_BASE>;
@@ -62,7 +56,7 @@ tee { description = "OP-TEE"; type = "tee"; - arch = ARCH; + arch = "riscv"; compression = "none"; os = "tee"; load = /bits/ 64 <CONFIG_SPL_OPTEE_LOAD_ADDR>;
@@ -76,7 +70,7 @@ description = "OpenSBI fw_dynamic Firmware"; type = "firmware"; os = "opensbi"; - arch = ARCH; + arch = "riscv"; compression = "none"; load = /bits/ 64 <CONFIG_SPL_OPENSBI_LOAD_ADDR>; entry = /bits/ 64 <CONFIG_SPL_OPENSBI_LOAD_ADDR>;
arch/riscv/include/asm/u-boot.h +0 -4
@@ -23,10 +23,6 @@#include <asm/u-boot-riscv.h> /* For image.h:image_check_target_arch() */ -#ifdef CONFIG_64BIT -#define IH_ARCH_DEFAULT IH_ARCH_RISCV64 -#else #define IH_ARCH_DEFAULT IH_ARCH_RISCV -#endif #endif /* _U_BOOT_H_ */
Signature · 1 line
2.43.0
Re: [PATCH] Revert "riscv: Select appropriate image type"
Quoted 10 lines · Mayuresh Chitale
This reverts commit
027a316828528da95a77d20632370b1bc2823f0bas discussed in [1].[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/dts/binman.dtsi | 14 ++++---------- arch/riscv/include/asm/u-boot.h | 4 ---- 2 files changed, 4 insertions(+), 14 deletions(-)
PATCH 1/1 Revert "riscv: image: Add new image type for RV64"
In reply to Mayuresh ChitaleThis reverts commit 14a4792a71db3561bea065415ac1f2ac69ef32b5 as discussed in [1].
[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
--- boot/image.c | 3 +-- include/image.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
boot/image.c +1 -2
@@ -92,8 +92,7 @@ static const table_entry_t uimage_arch[] = { { IH_ARCH_ARC, "arc", "ARC", }, { IH_ARCH_X86_64, "x86_64", "AMD x86_64", }, { IH_ARCH_XTENSA, "xtensa", "Xtensa", }, - { IH_ARCH_RISCV, "riscv", "RISC-V 32 Bit",}, - { IH_ARCH_RISCV64, "riscv64", "RISC-V 64 Bit",}, + { IH_ARCH_RISCV, "riscv", "RISC-V", }, { -1, "", "", }, };
include/image.h +1 -2
@@ -138,8 +138,7 @@ enum {IH_ARCH_ARC ,/* Synopsys DesignWare ARC */ IH_ARCH_X86_64 ,/* AMD x86_64, Intel and Via */ IH_ARCH_XTENSA ,/* Xtensa */ -IH_ARCH_RISCV ,/* RISC-V 32 bit*/ -IH_ARCH_RISCV64 ,/* RISC-V 64 bit*/ +IH_ARCH_RISCV ,/* RISC-V */ IH_ARCH_COUNT, };
Signature · 1 line
2.43.0
Re: [PATCH] Revert "riscv: image: Add new image type for RV64"
Quoted 10 lines · Mayuresh Chitale
This reverts commit
14a4792a71db3561bea065415ac1f2ac69ef32b5as discussed in [1].[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
Signed-off-by Mayuresh Chitale <[email protected]>--- boot/image.c | 3 +-- include/image.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
Quoted 10 lines · Mayuresh Chitale
This reverts commit
37b0b22d8b7bbed6aa95b6daed06dcbf4a66f211as discussed in [1].[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/lib/bootm.c | 4 ---- cmd/booti.c | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-)
Hi Mayuresh,
Quoted 5 lines · Mayuresh Chitale
This reverts commit
37b0b22d8b7bbed6aa95b6daed06dcbf4a66f211as discussed in [1].[1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html
I would recommend to add a little bit of context instead of simply pointing at some mail (which also is only Tom saying it's fine to revert as people shouldn't have shipped anything with this patch, not the reasons for reverting it). Also because links notoriously disappears or get broken (though I do have faith lists.denx.de is probably here to stay :) ).
Same remark for the other patches. No other feedback from me, I'm not involved with RISC-V architecture.
Cheers,
Quentin