]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
hw/xtensa/xtfpga: treat uImage load address as virtual
authorMax Filippov <jcmvbkbc@gmail.com>
Sun, 19 Oct 2014 04:39:10 +0000 (08:39 +0400)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 7 Jan 2015 00:39:24 +0000 (18:39 -0600)
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-stable@nongnu.org
Reported-by: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
(cherry picked from commit 6d2e4530532ca1dbb5e68bdcca12e10931bc6503)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/xtensa/xtfpga.c

index 937d01edfd204d568376a1c70092e2cd8b3328f7..e60ff90d6b94ed6b445905f0e79948c40fb7e2c6 100644 (file)
@@ -326,7 +326,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)
             hwaddr ep;
             int is_linux;
             success = load_uimage(kernel_filename, &ep, NULL, &is_linux,
-                                  NULL, NULL);
+                                  translate_phys_addr, cpu);
             if (success > 0 && is_linux) {
                 entry_point = ep;
             } else {