浏览代码

lsxl: unset ncip for rescue mode

Instead of using the serverip we get from the DHCP server, implicitly use
the broadcast address, which is automatically set when no ncip environment
variable is set. That way it isn't necessary to use a special DHCP
configuration to set the netconsole peer.

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Michael Walle 12 年之前
父节点
当前提交
23c9946a3b
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 2 3
      board/buffalo/lsxl/lsxl.c
  2. 1 1
      include/configs/lsxl.h

+ 2 - 3
board/buffalo/lsxl/lsxl.c

@@ -49,9 +49,8 @@
  * you can do this only with a working network connection. Therefore, a random
  * you can do this only with a working network connection. Therefore, a random
  * ethernet address is generated if none is set and a DHCP request is sent.
  * ethernet address is generated if none is set and a DHCP request is sent.
  * After a successful DHCP response is received, the network settings are
  * After a successful DHCP response is received, the network settings are
- * configured and the ncip parameter is set to the serverip. Eg. for a working
- * resuce mode, you should set 'next-server' to the host where the netconsole
- * client is started.
+ * configured and the ncip is unset. Therefore, all netconsole packets are
+ * broadcasted.
  * Additionally, the bootsource is set to 'rescue'.
  * Additionally, the bootsource is set to 'rescue'.
  */
  */
 
 

+ 1 - 1
include/configs/lsxl.h

@@ -146,7 +146,7 @@
 	"config_nc_dhcp=setenv autoload_old ${autoload}; "		\
 	"config_nc_dhcp=setenv autoload_old ${autoload}; "		\
 		"setenv autoload no "					\
 		"setenv autoload no "					\
 		"&& bootp "						\
 		"&& bootp "						\
-		"&& setenv ncip ${serverip} "				\
+		"&& setenv ncip "					\
 		"&& setenv autoload ${autoload_old}; "			\
 		"&& setenv autoload ${autoload_old}; "			\
 		"setenv autoload_old\0"					\
 		"setenv autoload_old\0"					\
 	"standard_env=setenv ipaddr; setenv netmask; setenv serverip; "	\
 	"standard_env=setenv ipaddr; setenv netmask; setenv serverip; "	\