diff options
| author | Stefan Roese <sr@denx.de> | 2008-01-16 11:22:30 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-01-16 11:22:30 +0100 |
| commit | 8d99cd0691b7094ea1e2bf5309b0877047a9f375 (patch) | |
| tree | 464c5cbd4ffe06419bcb03d8c9e9499a77fbd4d4 /include/configs/ads5121.h | |
| parent | 9adfc9fb9ade64cdf1ed9ff842e4f900cbda78bd (diff) | |
| parent | 58d204256cb1ce1bd323847d9f644acf70a72e6a (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/configs/ads5121.h')
| -rw-r--r-- | include/configs/ads5121.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index a4de5524e..ce458ae5b 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -295,7 +295,7 @@ * to 0xFFFF, watchdog timeouts after about 64s. For details refer * to chapter 36 of the MPC5121e Reference Manual. */ -#define CONFIG_WATCHDOG /* enable watchdog */ +/* #define CONFIG_WATCHDOG */ /* enable watchdog */ #define CFG_WATCHDOG_VALUE 0xFFFF /* @@ -306,9 +306,9 @@ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ #ifdef CONFIG_CMD_KGDB - #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ + #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else - #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ + #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #endif @@ -340,8 +340,8 @@ * * Boot Flags */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ @@ -351,7 +351,7 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE +#define CONFIG_TIMESTAMP #define CONFIG_HOSTNAME ads5121 #define CONFIG_BOOTFILE ads5121/uImage |