Commit d566f754256e71aadd40a0a031997be42fce3d08
1 parent
cd5d95653c
Exists in
v2017.01-smarct4x
and in
30 other branches
ARM: uniphier: fix nfsboot command
This is no longer working, so needs reworking. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Showing 1 changed file with 8 additions and 2 deletions Side-by-side Diff
include/configs/uniphier.h
| ... | ... | @@ -173,7 +173,7 @@ |
| 173 | 173 | "setenv bootargs $bootargs root=/dev/nfs rw " \ |
| 174 | 174 | "nfsroot=$serverip:$rootpath " \ |
| 175 | 175 | "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \ |
| 176 | - "tftpboot; bootm;" | |
| 176 | + "run __nfsboot" | |
| 177 | 177 | |
| 178 | 178 | #ifdef CONFIG_FIT |
| 179 | 179 | #define CONFIG_BOOTFILE "fitImage" |
| ... | ... | @@ -186,7 +186,8 @@ |
| 186 | 186 | "nandboot=nand read $fit_addr_r $fit_addr $fit_size &&" \ |
| 187 | 187 | "bootm $fit_addr_r\0" \ |
| 188 | 188 | "tftpboot=tftpboot $fit_addr_r $bootfile &&" \ |
| 189 | - "bootm $fit_addr_r\0" | |
| 189 | + "bootm $fit_addr_r\0" \ | |
| 190 | + "__nfsboot=run tftpboot\0" | |
| 190 | 191 | #else |
| 191 | 192 | #define CONFIG_CMD_BOOTZ |
| 192 | 193 | #define CONFIG_BOOTFILE "zImage" |
| ... | ... | @@ -215,6 +216,11 @@ |
| 215 | 216 | "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \ |
| 216 | 217 | "tftpboot $ramdisk_addr_r $ramdisk_file &&" \ |
| 217 | 218 | "tftpboot $fdt_addr_r $fdt_file &&" \ |
| 219 | + "run boot_common\0" \ | |
| 220 | + "__nfsboot=tftpboot $kernel_addr_r $bootfile &&" \ | |
| 221 | + "tftpboot $fdt_addr_r $fdt_file &&" \ | |
| 222 | + "tftpboot $fdt_addr_r $fdt_file &&" \ | |
| 223 | + "setenv ramdisk_addr_r - &&" \ | |
| 218 | 224 | "run boot_common\0" |
| 219 | 225 | #endif |
| 220 | 226 |