diff options
| author | wdenk <wdenk> | 2003-07-16 16:40:22 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-07-16 16:40:22 +0000 |
| commit | cb4dbb7bbc271f988e14ec353a5e86d7f10e1da0 (patch) | |
| tree | ca7b875ee18e09e8aea45ffb22539a15fadaf77c /include | |
| parent | ad12965db5d145f7cf7595cbeaf03b3402f42897 (diff) | |
| download | talos-obmc-uboot-cb4dbb7bbc271f988e14ec353a5e86d7f10e1da0.tar.gz talos-obmc-uboot-cb4dbb7bbc271f988e14ec353a5e86d7f10e1da0.zip | |
Incorporate Patch by Lutz Dennig, 15 Jul 2003.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/R360MPI.h | 19 | ||||
| -rw-r--r-- | include/version.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 8fa328e0cb..72fdf4db8b 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -51,7 +51,7 @@ #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate in bps */ #if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ +#define CONFIG_BOOTDELAY 0 /* immediate boot */ #else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #endif @@ -77,14 +77,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ -#if 0 -#ifdef CONFIG_LCD -# undef CONFIG_STATUS_LED /* disturbs display */ -#else -# define CONFIG_STATUS_LED 1 /* Status LED enabled */ -#endif /* CONFIG_LCD */ -#endif - #define CONFIG_CAN_DRIVER /* CAN Driver support enabled */ #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) @@ -125,6 +117,7 @@ CFG_CMD_DATE | \ CFG_CMD_I2C | \ CFG_CMD_IDE | \ + CFG_CMD_JFFS2 | \ CFG_CMD_PCMCIA | \ CFG_CMD_BSP ) @@ -134,6 +127,9 @@ /* * Miscellaneous configurable options */ +#define CFG_DEVICE_NULLDEV 1 /* we need the null device */ +#define CFG_CONSOLE_IS_IN_ENV 1 /* must set console from env */ + #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ #if (CONFIG_COMMANDS & CFG_CMD_KGDB) @@ -154,6 +150,11 @@ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +/* JFFS2 stuff */ +#define CFG_JFFS2_FIRST_BANK 0 +#define CFG_JFFS2_NUM_BANKS 1 +#define CFG_JFFS2_FIRST_SECTOR 24 + /* * Low Level Configuration Settings * (address mappings, register initial values, etc.) diff --git a/include/version.h b/include/version.h index b8632eca0e..fb7411e3ae 100644 --- a/include/version.h +++ b/include/version.h @@ -24,6 +24,6 @@ #ifndef __VERSION_H__ #define __VERSION_H__ -#define U_BOOT_VERSION "U-Boot 0.4.3" +#define U_BOOT_VERSION "U-Boot 0.4.4" #endif /* __VERSION_H__ */ |
