diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-08-09 13:36:54 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-08-09 13:36:54 -0500 |
| commit | 281f69ede28cd3d8be5d62a96b5a0b73e6065858 (patch) | |
| tree | 8f1a0f42ce7d9c66d0ff2ecf93c9b069cbc68cc0 /board/mcc200/mcc200.c | |
| parent | 870cbeaa45ccdbd6566882741da9f82433bd4a86 (diff) | |
| parent | 6587f7e1e98bfcb7910a47bae2eb51e9a5fbd4da (diff) | |
| download | u-boot-imx-281f69ede28cd3d8be5d62a96b5a0b73e6065858.zip u-boot-imx-281f69ede28cd3d8be5d62a96b5a0b73e6065858.tar.gz u-boot-imx-281f69ede28cd3d8be5d62a96b5a0b73e6065858.tar.bz2 | |
Merge branch 'wd'
Diffstat (limited to 'board/mcc200/mcc200.c')
| -rw-r--r-- | board/mcc200/mcc200.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c index 5fe239f..167dc0f 100644 --- a/board/mcc200/mcc200.c +++ b/board/mcc200/mcc200.c @@ -28,7 +28,16 @@ #include <mpc5xxx.h> #include <pci.h> -#include "mt48lc8m32b2-6-7.h" +/* Two MT48LC8M32B2 for 32 MB */ +/* #include "mt48lc8m32b2-6-7.h" */ + +/* One MT48LC16M32S2 for 64 MB */ +/* #include "mt48lc16m32s2-75.h" */ +#if defined (CONFIG_MCC200_SDRAM) +#include "mt48lc16m16a2-75.h" +#else +#include "mt46v16m16-75.h" +#endif DECLARE_GLOBAL_DATA_PTR; @@ -74,6 +83,8 @@ static void sdram_start (int hi_addr) /* normal operation */ *(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | hi_addr_bit; __asm__ volatile ("sync"); + + udelay(10); } #endif @@ -242,8 +253,8 @@ int misc_init_r (void) /* Unprotect the upper bank of the Flash */ *(volatile int*)MPC5XXX_CS0_CFG |= (1 << 6); flash_protect (FLAG_PROTECT_CLEAR, - flash_info[0].start[0], - (flash_info[0].start[0] + flash_info[0].size) / 2 - 1, + flash_info[0].start[0] + flash_info[0].size / 2, + (flash_info[0].start[0] - 1) + flash_info[0].size, &flash_info[0]); *(volatile int*)MPC5XXX_CS0_CFG &= ~(1 << 6); } |