diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-01-21 14:56:06 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-02-14 16:36:12 +0900 |
| commit | 90a6e929881caf4a74015c8e8f2279ee0a7b3804 (patch) | |
| tree | ab8a946367732bcfad2493020f43d1f5fc1fb510 /include | |
| parent | 9ef2835f26652092a61b0cb0551ef4f36be27946 (diff) | |
| download | blackbird-obmc-uboot-90a6e929881caf4a74015c8e8f2279ee0a7b3804.tar.gz blackbird-obmc-uboot-90a6e929881caf4a74015c8e8f2279ee0a7b3804.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index bf89a0e070..ec4fd67ee6 100644 --- 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 &&" \ |
