ARM: uniphier: fix NOR boot command

Commit 89835b3557fe ("ARM: uniphier: allow to run zImage rather than
uImage") changed the kernel boot commands.  Unlike "bootm", "bootz"
does not relocate the kernel image.  When the boot device is a NOR
flash, the zImage should be copied from the NOR onto the DRAM before
it is passed to the "bootz" command.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index bf89a0e070609b598327f53e267de2b98ce2316d..ec4fd67ee6bb36f241df2cddacc3b3dcb629dda8 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -203,9 +203,10 @@
        "ramdisk_file=rootfs.cpio.uboot\0" \
        "norboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
                "setexpr kernel_addr $nor_base + $kernel_addr &&" \
+               "cp.b $kernel_addr $kernel_addr_r $kernel_size &&" \
                "setexpr ramdisk_addr $nor_base + $ramdisk_addr &&" \
                "setexpr fdt_addr $nor_base + $fdt_addr &&" \
-               "bootz $kernel_addr $ramdisk_addr $fdt_addr\0" \
+               "bootz $kernel_addr_r $ramdisk_addr $fdt_addr\0" \
        "nandboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
                "nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
                "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
@@ -221,7 +222,7 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "netdev=eth0\0"                                         \
        "verify=n\0"                                            \
-       "norbase=0x42000000\0"                                  \
+       "nor_base=0x42000000\0"                                 \
        "nandupdate=nand erase 0 0x00100000 &&"                 \
                "tftpboot u-boot-spl-dtb.bin &&"                \
                "nand write $loadaddr 0 0x00010000 &&"          \