diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-21 23:36:40 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-21 23:36:40 +0200 |
| commit | f82c087e60fe1c59ace1c6f016eb89c5d3c3ae13 (patch) | |
| tree | 84f49f79333f7bfa222bb607925d79e6c45ffc44 /include/configs/M5329EVB.h | |
| parent | 1b81f017b04b5a176f5f9230ec979f0f3c55ba5b (diff) | |
| parent | f6ef7428ed6ce694e6d86410c116f8c48af33d27 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
* 'master' of git://git.denx.de/u-boot-coldfire:
ColdFire: Clean Makefile _config rules
ColdFire: Move boards with simple _config rules to boards.cfg
ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 defined
ColdFire: Merge differentiated linking files into a sigle one by board
ColdFire: Add $(obj) before cpu lib to correct build
ColdFire: Cleanup lds files for multiple defined symbols
Diffstat (limited to 'include/configs/M5329EVB.h')
| -rw-r--r-- | include/configs/M5329EVB.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 67cdff11a2..29b9b2a69b 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -60,7 +60,7 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#ifdef NANDFLASH_SIZE +#ifdef CONFIG_NANDFLASH_SIZE # define CONFIG_CMD_NAND #endif @@ -209,7 +209,7 @@ # define CONFIG_SYS_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ #endif -#ifdef NANDFLASH_SIZE +#ifdef CONFIG_NANDFLASH_SIZE # define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE # define CONFIG_SYS_NAND_SIZE 1 @@ -265,9 +265,9 @@ #define CONFIG_SYS_CS1_MASK 0x001f0001 #define CONFIG_SYS_CS1_CTRL 0x002A3780 -#ifdef NANDFLASH_SIZE +#ifdef CONFIG_NANDFLASH_SIZE #define CONFIG_SYS_CS2_BASE 0x20000000 -#define CONFIG_SYS_CS2_MASK ((NANDFLASH_SIZE << 20) | 1) +#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1) #define CONFIG_SYS_CS2_CTRL 0x00001f60 #endif |