Added support for the D-Link DSM-G600 RevA, and fixed the clock frequency for NSLU2...

[openwrt.git] / target / linux / at91-2.6 / image / u-boot / ubclient / ubpar.c

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 99d7570..7e8ea0e 100644 (file)
--- 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,21 +29,31 @@ extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
 #define ENV_CRC ~0
 #endif
 
 #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"
        "stdin=serial\0"
        "stdout=serial\0"
        "stderr=serial\0"
 static char *environment[] = {
        "bootdelay=3\0"
        "baudrate=115200\0"
        "stdin=serial\0"
        "stdout=serial\0"
        "stderr=serial\0"

-       "partitions=mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data)\0"
-       "fbargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0"
-       "rdba=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) 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"
+       "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 uImage; tftp 21200000 root.squashfs; bootm 21000000\0"

        "flash=run fbargs; bootm 0xc0042000\0"
        "flash=run fbargs; bootm 0xc0042000\0"

-       "bootargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0"
+       "bootargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0"

        "bootcmd=bootm 0xc0042000\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"
        };
 
        "\0"
        };
 


@@ -116,7 +126,7 @@ int main(int argc, char *argv[]) {
 
        envptr->crc = crc32(0, envptr->data, ENV_SIZE);
 
 
        envptr->crc = crc32(0, envptr->data, ENV_SIZE);
 

-       params = fopen("params", "w");
+       params = fopen("/dev/mtd1", "w");

        fwrite(envptr, CFG_ENV_SIZE, 1, params);
        fclose(params);
 
        fwrite(envptr, CFG_ENV_SIZE, 1, params);
        fclose(params);