diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-13 22:12:58 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-13 22:12:58 +0200 |
| commit | cf8f60f0eaeba44190fc9a0b56f0a53850ccb8c9 (patch) | |
| tree | 9ad4aaaef72a926b5e9dd588bf5d4074b74fc641 /board/tqm8xx/flash.c | |
| parent | d22d102808ddae3d40360df8d94e7f4239c88093 (diff) | |
| parent | 090eb73510838c0e8c20d80eea0d7f9e774ff6b5 (diff) | |
Merge with /home/mk/11-cmb1920/u-boot
Diffstat (limited to 'board/tqm8xx/flash.c')
| -rw-r--r-- | board/tqm8xx/flash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/tqm8xx/flash.c b/board/tqm8xx/flash.c index ab57ee5c619..db0a7e5eb86 100644 --- a/board/tqm8xx/flash.c +++ b/board/tqm8xx/flash.c @@ -33,12 +33,13 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) +#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \ + && !defined(CONFIG_TQM885D) # ifndef CFG_OR_TIMING_FLASH_AT_50MHZ # define CFG_OR_TIMING_FLASH_AT_50MHZ (OR_ACS_DIV1 | OR_TRLX | OR_CSNT_SAM | \ OR_SCY_2_CLK | OR_EHTR | OR_BI) # endif -#endif /* CONFIG_TQM8xxL/M, !TQM866M */ +#endif /* CONFIG_TQM8xxL/M, !TQM866M, !TQM885D */ #ifndef CFG_ENV_ADDR #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) |