diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-13 00:36:25 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-13 00:36:25 +0100 |
| commit | 89d56f5503eed351efe5ab0b4dd0f1e888fd2336 (patch) | |
| tree | b1005c9362d07c381cbf165a2c0dc0ab1f54e41e /include/configs | |
| parent | 3680aed04f6c971b5f5d66ca7ea82d68f81b0f41 (diff) | |
| parent | 19ef4f7a6ef3b725aa9fe4b4f5fb676a84160172 (diff) | |
| download | u-boot-imx-89d56f5503eed351efe5ab0b4dd0f1e888fd2336.zip u-boot-imx-89d56f5503eed351efe5ab0b4dd0f1e888fd2336.tar.gz u-boot-imx-89d56f5503eed351efe5ab0b4dd0f1e888fd2336.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/CPCI405.h | 6 | ||||
| -rw-r--r-- | include/configs/alpr.h | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index 1a2bc1c..89ba139 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -196,9 +196,9 @@ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_FLASH_BASE 0xFFFD0000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_MONITOR_LEN (192 * 1024) /* Reserve 196 kB for Monitor */ +#define CONFIG_SYS_FLASH_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ /* diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 6e9f5e5..7ce8205 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -235,18 +235,15 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_ELF #define CONFIG_CMD_FPGA #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_NET -#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_REGINFO - +#undef CONFIG_CMD_NFS #undef CONFIG_WATCHDOG /* watchdog disabled */ |