U-boot for xtensa always treats uImage load address as virtual address.
This is important when booting uImage on xtensa core with MMUv2, because
MMUv2 has fixed non-identity virtual-to-physical mapping after reset.
Always do virtual-to-physical translation of uImage load address and
load uImage at the translated address. This fixes booting uImage kernels
on dc232b and other MMUv2 cores.
Cc: qemu-sta...@nongnu.org
Reported-by: Waldemar Brodkorb <m...@waldemar-brodkorb.de>
Signed-off-by: Max Filippov <jcmvb...@gmail.com>
---
hw/xtensa/xtfpga.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index a2dff5a..71be863 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -323,9 +323,16 @@ static void lx_init(const LxBoardDesc *board, MachineState
*machine)
if (success > 0) {
entry_point = elf_entry;
} else {
+ uboot_image_header_t hdr;
hwaddr ep;
int is_linux;
- success = load_uimage(kernel_filename, &ep, NULL, &is_linux);
+
+ success = load_uboot_image_header(kernel_filename, &hdr);
+ if (success == 0) {
+ success = load_uimage_at(kernel_filename, &ep,
+ translate_phys_addr(cpu, hdr.ih_load),
+ &is_linux);
+ }
if (success > 0 && is_linux) {
entry_point = ep;
} else {
--
1.8.1.4
