u-boot.lists.denx.de archive mirror
 help / color / mirror / Atom feed
* [PATCH] riscv: Support riscv64 image type
@ 2023-04-10  7:27 Rick Chen
  2023-04-19  1:46 ` Simon Glass
  0 siblings, 1 reply; 6+ messages in thread
From: Rick Chen @ 2023-04-10  7:27 UTC (permalink / raw)
  To: sjg; +Cc: u-boot, bmeng.cn, ycliang, rick, rickchen36

Allow U-Boot to load 32 or 64 bits RISC-V Kernel Image
distinguishly. It helps to avoid someone maybe make a mistake
to run 32-bit U-Boot to load 64-bit kernel.

Signed-off-by: Rick Chen <rick@andestech.com>

---
The patchset is based on Simon's patch:
riscv: Add a 64-bit image type
---
---
 arch/riscv/include/asm/u-boot.h | 4 ++++
 cmd/booti.c                     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h
index d5e1d5f323..e3b4a0357c 100644
--- a/arch/riscv/include/asm/u-boot.h
+++ b/arch/riscv/include/asm/u-boot.h
@@ -23,6 +23,10 @@
 #include <asm/u-boot-riscv.h>
 
 /* For image.h:image_check_target_arch() */
+#ifdef CONFIG_ARCH_RV64I
+#define IH_ARCH_DEFAULT IH_ARCH_RISCV64
+#else
 #define IH_ARCH_DEFAULT IH_ARCH_RISCV
+#endif
 
 #endif	/* _U_BOOT_H_ */
diff --git a/cmd/booti.c b/cmd/booti.c
index 6ac39193db..dc0b0ae41c 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -119,7 +119,7 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 
 	images.os.os = IH_OS_LINUX;
 #ifdef CONFIG_RISCV_SMODE
-	images.os.arch = IH_ARCH_RISCV;
+	images.os.arch = IH_ARCH_DEFAULT;
 #elif CONFIG_ARM64
 	images.os.arch = IH_ARCH_ARM64;
 #endif
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-07-27  1:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-10  7:27 [PATCH] riscv: Support riscv64 image type Rick Chen
2023-04-19  1:46 ` Simon Glass
2023-04-19  6:56   ` Rick Chen
2023-07-26 21:33     ` Simon Glass
2023-07-27  1:27       ` Rick Chen
2023-07-27  1:39         ` Leo Liang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).