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

Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi
index c5b0464..b518560 100644 (file)
--- a/arch/riscv/dts/binman.dtsi
+++ b/arch/riscv/dts/binman.dtsi
@@ -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>;

diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h
index a90cc4c..d5e1d5f 100644 (file)
--- a/arch/riscv/include/asm/u-boot.h
+++ b/arch/riscv/include/asm/u-boot.h
@@ -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_ */