colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 37b0b22d8b 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>
This commit is contained in:
Mayuresh Chitale
2025-05-29 03:30:49 +00:00
committed by Leo Yu-Chi Liang
parent b22a276f03
commit 04fcd9a56b
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/riscv/lib/bootm.c
View File

@@ -90,10 +90,6 @@ static void boot_jump_linux(struct bootm_headers *images, int flag)
announce_and_cleanup(fake); announce_and_cleanup(fake);
if (!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) { if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
ret = smp_call_function(images->ep, ret = smp_call_function(images->ep,

7
cmd/booti.c
View File

@@ -130,11 +130,8 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
bootm_disable_interrupts(); bootm_disable_interrupts();
images.os.os = IH_OS_LINUX; images.os.os = IH_OS_LINUX;
if (IS_ENABLED(CONFIG_RISCV)) if (IS_ENABLED(CONFIG_RISCV_SMODE))
if (IS_ENABLED(CONFIG_64BIT)) images.os.arch = IH_ARCH_RISCV;
images.os.arch = IH_ARCH_RISCV64;
else
images.os.arch = IH_ARCH_RISCV;
else if (IS_ENABLED(CONFIG_ARM64)) else if (IS_ENABLED(CONFIG_ARM64))
images.os.arch = IH_ARCH_ARM64; images.os.arch = IH_ARCH_ARM64;