diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-01-21 14:56:09 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-02-14 16:36:12 +0900 |
| commit | d566f754256e71aadd40a0a031997be42fce3d08 (patch) | |
| tree | 72ccea327340f7f5139dbeb5191fa81fe37ac61b /include/configs | |
| parent | cd5d95653c34723f99c2c712e7a9455687d36e9f (diff) | |
ARM: uniphier: fix nfsboot command
This is no longer working, so needs reworking.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/uniphier.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index f8bb197978..b340f63cde 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -173,7 +173,7 @@ "setenv bootargs $bootargs root=/dev/nfs rw " \ "nfsroot=$serverip:$rootpath " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \ - "tftpboot; bootm;" + "run __nfsboot" #ifdef CONFIG_FIT #define CONFIG_BOOTFILE "fitImage" @@ -186,7 +186,8 @@ "nandboot=nand read $fit_addr_r $fit_addr $fit_size &&" \ "bootm $fit_addr_r\0" \ "tftpboot=tftpboot $fit_addr_r $bootfile &&" \ - "bootm $fit_addr_r\0" + "bootm $fit_addr_r\0" \ + "__nfsboot=run tftpboot\0" #else #define CONFIG_CMD_BOOTZ #define CONFIG_BOOTFILE "zImage" @@ -215,6 +216,11 @@ "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \ "tftpboot $ramdisk_addr_r $ramdisk_file &&" \ "tftpboot $fdt_addr_r $fdt_file &&" \ + "run boot_common\0" \ + "__nfsboot=tftpboot $kernel_addr_r $bootfile &&" \ + "tftpboot $fdt_addr_r $fdt_file &&" \ + "tftpboot $fdt_addr_r $fdt_file &&" \ + "setenv ramdisk_addr_r - &&" \ "run boot_common\0" #endif |