From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 21 Jan 2016 05:56:09 +0000 (+0900)
Subject: ARM: uniphier: fix nfsboot command
X-Git-Tag: v2016.03-rc2~25^2~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d566f754256e71aadd40a0a031997be42fce3d08;p=u-boot

ARM: uniphier: fix nfsboot command

This is no longer working, so needs reworking.

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

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