X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fat91-2.6%2Fimage%2Fu-boot%2Fubclient%2Fubpar.c;h=7e8ea0eb2d947cd552834bc3b4426dbc4d12bd20;hb=65a2c24998c71111239a6253f43c663a8aebe4fe;hp=228a578a6145706c3eeed49dd7061261b94a3591;hpb=800ef4cbea033edc09571616b574d957e2ba73fe;p=openwrt-10.03%2F.git

diff --git a/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c b/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c
index 228a578a6..7e8ea0eb2 100644
--- a/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c
+++ b/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c
@@ -29,6 +29,17 @@ extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
 #define ENV_CRC ~0
 #endif
 
+#ifdef LAN_IP
+	#warning LAN_IP
+#else
+	#warning LAN_IP NOT DEFINED
+#endif
+#ifdef LAN_SERVERIP
+	#warning LAN_SERVERIP
+#else
+	#warning LAN_SERVERIP NOT DEFINED
+#endif
+
 static char *environment[] = {
 	"bootdelay=3\0"
 	"baudrate=115200\0"
@@ -37,12 +48,12 @@ static char *environment[] = {
 	"stderr=serial\0"
 	"fbargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0"
 	"rdba=setenv bootargs root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0"
-	"rdram=run rdba; tftp 21000000 vImage; tftp 21200000 root.squashfs; bootm 21000000\0"
+	"rdram=run rdba; tftp 21000000 uImage; tftp 21200000 root.squashfs; bootm 21000000\0"
 	"flash=run fbargs; bootm 0xc0042000\0"
 	"bootargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0"
 	"bootcmd=bootm 0xc0042000\0"
-	"ipaddr=10.0.1.73\0"
-	"serverip=10.0.1.210\0"
+	"ipaddr=" MK_STR(LAN_IP) "\0"
+	"serverip=" MK_STR(LAN_SERVERIP) "\0"
 	"\0"
 	};