diff options
| author | Tom Rini <[email protected]> | 2025-06-02 08:40:37 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-02 08:40:37 -0600 |
| commit | 6f657c64c9c429a29f5b5e5167ef30825d23bb6d (patch) | |
| tree | 50ed54a1c2d4c2390ca16d5315f17637b19bdaf7 /cmd | |
| parent | b22a276f039f818d5564bec6637071cfc8a7e432 (diff) | |
| parent | 31e215fde81417299e45a6ae4a7ee880fac84c37 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-riscv
CI: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/26455
Thanks Conor and Yao for catching this issue.
- Revert "RISC-V 32/64 images support" to fix compatibility issue
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/booti.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmd/booti.c b/cmd/booti.c index ced2c1047ab..1a57fe91397 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -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; |