diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2007-01-10 00:26:15 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2007-01-10 00:26:15 +0100 |
| commit | d9384de2f571046e71081bae22b49e3d5ca2e3d5 (patch) | |
| tree | fd84f240a39977980de64a6c2010c734bf790fb2 /include | |
| parent | f4eb54529bb3664c3a562e488b460fe075f79d67 (diff) | |
| download | u-boot-imx-d9384de2f571046e71081bae22b49e3d5ca2e3d5.zip u-boot-imx-d9384de2f571046e71081bae22b49e3d5ca2e3d5.tar.gz u-boot-imx-d9384de2f571046e71081bae22b49e3d5ca2e3d5.tar.bz2 | |
CAM5200 flash driver modifications:
- use CFI driver (replaces custom flash driver) for main 'cam5200' target
- add second build target 'cam5200_niosflash' which still uses custom driver
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/TQM5200.h | 20 |
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 */ |