Skip to contentSkip to conversation

Revert "booti/bootm: riscv: Verify image arch type"

PATCH In review Mayuresh Chitale 3 participants 7 messages May 29, 2025 – Jun 2, 2025 RISC-V

lore
Share & tools
lore
#0 lore raw

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
index c98c5e76633..9544907ab1e 100644
@@ -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
index ced2c1047ab..1a57fe91397 100644
@@ -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
#1 lore raw

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
index c5b0464d6a7..b518560bb94 100644
@@ -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
index a90cc4c21cf..d5e1d5f3231 100644
@@ -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
#3 lore raw

PATCH 1/1 Revert "riscv: image: Add new image type for RV64"

In reply to Mayuresh Chitale

This 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
index 45299a7dc33..139c5bd035a 100644
@@ -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
index 4620782c069..c1db8383459 100644
@@ -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
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] Revert "riscv: Select appropriate image type"

In reply to Mayuresh Chitale
Quoted 10 lines · Mayuresh Chitale

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(-)
Reviewed-by on v1 1/1
#4 lore raw

Re: [PATCH] Revert "riscv: image: Add new image type for RV64"

In reply to Mayuresh Chitale
Quoted 10 lines · Mayuresh Chitale

This 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(-)
#6 lore raw
In reply to Mayuresh Chitale

Hi Mayuresh,

Quoted 5 lines · Mayuresh Chitale

This reverts commit 37b0b22d8b7bbed6aa95b6daed06dcbf4a66f211 as 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