diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2006-07-12 15:26:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2006-07-12 15:26:01 +0200 |
| commit | 090eb73510838c0e8c20d80eea0d7f9e774ff6b5 (patch) | |
| tree | e64701554fe3f14e73d29657328e66ccee04c64f /board | |
| parent | d6cc73e4e70a7f8712c52ef9d93a19a906cc3d4b (diff) | |
| download | u-boot-imx-090eb73510838c0e8c20d80eea0d7f9e774ff6b5.zip u-boot-imx-090eb73510838c0e8c20d80eea0d7f9e774ff6b5.tar.gz u-boot-imx-090eb73510838c0e8c20d80eea0d7f9e774ff6b5.tar.bz2 | |
Add support for TQM885D board.
Patch by Martin Krause, 20 Mar 2006
Signed-off-by: Martin Krause <martin.krause@tqs.de>
Diffstat (limited to 'board')
| -rw-r--r-- | board/tqm8xx/flash.c | 5 | ||||
| -rw-r--r-- | board/tqm8xx/tqm8xx.c | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/board/tqm8xx/flash.c b/board/tqm8xx/flash.c index ab57ee5..db0a7e5 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) diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c index b292231..06c84f7 100644 --- a/board/tqm8xx/tqm8xx.c +++ b/board/tqm8xx/tqm8xx.c @@ -119,6 +119,10 @@ int checkboard (void) gd->board_type = 'M'; } + if ((*(s + 6) == 'D')) { /* a TQM885D type */ + gd->board_type = 'D'; + } + for (; *s; ++s) { if (*s == ' ') break; @@ -178,7 +182,8 @@ long int initdram (int board_type) #ifndef CONFIG_CAN_DRIVER if ((board_type != 'L') && - (board_type != 'M') ) { /* "L" and "M" type boards have only one bank SDRAM */ + (board_type != 'M') && + (board_type != 'D') ) { /* "L" and "M" type boards have only one bank SDRAM */ memctl->memc_or3 = CFG_OR3_PRELIM; memctl->memc_br3 = CFG_BR3_PRELIM; } @@ -197,7 +202,8 @@ long int initdram (int board_type) #ifndef CONFIG_CAN_DRIVER if ((board_type != 'L') && - (board_type != 'M') ) { /* "L" and "M" type boards have only one bank SDRAM */ + (board_type != 'M') && + (board_type != 'D') ) { /* "L" and "M" type boards have only one bank SDRAM */ memctl->memc_mcr = 0x80006105; /* SDRAM bank 1 */ udelay (1); memctl->memc_mcr = 0x80006230; /* SDRAM bank 1 - execute twice */ @@ -255,7 +261,8 @@ long int initdram (int board_type) #ifndef CONFIG_CAN_DRIVER if ((board_type != 'L') && - (board_type != 'M') ) { /* "L" and "M" type boards have only one bank SDRAM */ + (board_type != 'M') && + (board_type != 'D') ) { /* "L" and "M" type boards have only one bank SDRAM */ /* * Check Bank 1 Memory Size * use current column settings |