V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: uniphier: fix nfsboot command 

This is no longer working, so needs reworking.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-01-21 14:56:09 +09:00
parent cd5d95653c
commit d566f75425
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/configs/uniphier.h
View File

@ -173,7 +173,7 @@
"setenv bootargs $bootargs root=/dev/nfs rw " \ "setenv bootargs $bootargs root=/dev/nfs rw " \
"nfsroot=$serverip:$rootpath " \ "nfsroot=$serverip:$rootpath " \
"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \
"tftpboot; bootm;" "run __nfsboot"
#ifdef CONFIG_FIT #ifdef CONFIG_FIT
#define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTFILE "fitImage"
@ -186,7 +186,8 @@
"nandboot=nand read $fit_addr_r $fit_addr $fit_size &&" \ "nandboot=nand read $fit_addr_r $fit_addr $fit_size &&" \
"bootm $fit_addr_r\0" \ "bootm $fit_addr_r\0" \
"tftpboot=tftpboot $fit_addr_r $bootfile &&" \ "tftpboot=tftpboot $fit_addr_r $bootfile &&" \
"bootm $fit_addr_r\0" "bootm $fit_addr_r\0" \
"__nfsboot=run tftpboot\0"
#else #else
#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_BOOTZ
#define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTFILE "zImage"
@ -215,6 +216,11 @@
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \ "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
"tftpboot $ramdisk_addr_r $ramdisk_file &&" \ "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
"tftpboot $fdt_addr_r $fdt_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" "run boot_common\0"
#endif #endif