diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-03 18:05:48 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-12-19 15:54:21 +0100 |
| commit | 0c8d44812239d8c4590b8b4790460251f01ae033 (patch) | |
| tree | bd0e8c93c206b69a8b50343addc7ef8265a355ad | |
| parent | a5a58826110eb3da2956c6b3213bd750e166d75c (diff) | |
autoboot
| -rw-r--r-- | include/configs/integratorcp.h | 12 | ||||
| -rw-r--r-- | net/bootp.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 608719a7ea..6f380bf001 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -43,11 +43,15 @@ */ #include <config_cmd_default.h> -#define CONFIG_BOOTDELAY 2 +#define CONFIG_NET_RETRY_COUNT 500 +#define CONFIG_BOOTDELAY 1 #define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" -#define CONFIG_BOOTCOMMAND "tftpboot ; bootm" -#define CONFIG_SERVERIP 192.168.1.100 -#define CONFIG_IPADDR 192.168.1.104 +#define CONFIG_BOOTCOMMAND "" \ + "set serverip 192.168.1.32 ; " \ + "set ipaddr 192.168.1.35 ; " \ + "tftpboot 0x00007fc0 192.168.1.32:uImage ; " \ + "tftpboot 0x00800000 192.168.1.32:integratorcp.dtb ; " \ + "bootm 0x00007fc0 - 0x00800000" #define CONFIG_BOOTFILE "uImage" /* diff --git a/net/bootp.c b/net/bootp.c index 81066015f1..eb573751d1 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -34,7 +34,7 @@ * is reached. */ #ifndef CONFIG_NET_RETRY_COUNT -# define TIMEOUT_COUNT 5 /* # of timeouts before giving up */ +# define TIMEOUT_COUNT 500 /* # of timeouts before giving up */ #else # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT) #endif |