diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-13 18:37:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-13 18:37:31 +0200 |
| commit | 46044b4817b75c1e26d22fed679e778a044df712 (patch) | |
| tree | b14fd959507bfe034ae3dd669b8a7055ee1f1e75 /include | |
| parent | 55d150d95dbd4612f229e1f503c3a6aa8ed08a96 (diff) | |
| parent | 0e1fb5eebf84455dbceab825840d3b118fbbc7f3 (diff) | |
| download | u-boot-46044b4817b75c1e26d22fed679e778a044df712.tar.gz u-boot-46044b4817b75c1e26d22fed679e778a044df712.tar.xz u-boot-46044b4817b75c1e26d22fed679e778a044df712.zip | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MIP405.h | 2 | ||||
| -rw-r--r-- | include/configs/PIP405.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 0af9c68dc8..6c2f17d587 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -128,7 +128,7 @@ #define CONFIG_BAUDRATE 9600 /* STD Baudrate */ #define CONFIG_BOOTDELAY 5 /* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */ -#define CONFIG_BOOT_RETRY_TIME -10 /* feature is avaiable but not enabled */ +/* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check console even if bootdelay = 0 */ #define CONFIG_BOOTCOMMAND "diskboot 400000 0:1; bootm" /* autoboot command */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index dbec242d6c..9ac57151cb 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -112,7 +112,7 @@ #define CONFIG_BOOTDELAY 5 /* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */ -#define CONFIG_BOOT_RETRY_TIME -10 /* feature is avaiable but not enabled */ +/* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check console even if bootdelay = 0 */ |