summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorDetlev Zundel <dzu@denx.de>2007-01-10 16:36:51 +0100
committerDetlev Zundel <dzu@denx.de>2007-01-10 16:36:51 +0100
commit0350e79d2a2a07444605e5ab820e10b7eb76e5d6 (patch)
tree36cd753c2528665129a418b97e3a506f7fa6e606 /include/configs
parentbab5a90d4ccc1a46a8127b867fa59028cc623ad9 (diff)
parentd9384de2f571046e71081bae22b49e3d5ca2e3d5 (diff)
downloadu-boot-imx-0350e79d2a2a07444605e5ab820e10b7eb76e5d6.zip
u-boot-imx-0350e79d2a2a07444605e5ab820e10b7eb76e5d6.tar.gz
u-boot-imx-0350e79d2a2a07444605e5ab820e10b7eb76e5d6.tar.bz2
Merge with /home/m8/git/u-boot/
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/TQM5200.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 08674ca..15906a0 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -325,15 +325,7 @@
*/
#define CFG_FLASH_BASE 0xFC000000
-#ifndef CONFIG_CAM5200
-/* use CFI flash driver */
-#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */
-#define CFG_FLASH_BANKS_LIST { CFG_BOOTCS_START }
-#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
- (= chip selects) */
-#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
-#else /* CONFIG_CAM5200 */
+#if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH)
#define CFG_MAX_FLASH_BANKS 2 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_WORD_SIZE unsigned int /* main flash device with */
@@ -344,7 +336,15 @@
#define CFG_FLASH_ADDR1 0x2AA
#define CFG_FLASH_2ND_16BIT_DEV 1 /* NIOS flash is a 16bit device */
#define CFG_MAX_FLASH_SECT 128
-#endif /* ifndef CONFIG_CAM5200 */
+#else
+/* use CFI flash driver */
+#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
+#define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */
+#define CFG_FLASH_BANKS_LIST { CFG_BOOTCS_START }
+#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
+ (= chip selects) */
+#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
+#endif
#define CFG_FLASH_EMPTY_INFO
#define CFG_FLASH_SIZE 0x04000000 /* 64 MByte */