diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-11-24 20:12:12 +0300 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2010-01-07 18:33:52 -0600 |
| commit | 2e95004deb6e33e33bf1b8a92a38cd2115bac4c2 (patch) | |
| tree | f36761ada7fdf6663643aba5fdab3411409d2f5e /board/freescale/mpc8315erdb/sdram.c | |
| parent | 6ca9da4d42aeb43df5ef29f7d0518009df583b2f (diff) | |
| download | u-boot-imx-2e95004deb6e33e33bf1b8a92a38cd2115bac4c2.zip u-boot-imx-2e95004deb6e33e33bf1b8a92a38cd2115bac4c2.tar.gz u-boot-imx-2e95004deb6e33e33bf1b8a92a38cd2115bac4c2.tar.bz2 | |
mpc83xx: Add NAND boot support for MPC8315E-RDB boards
The core support for NAND booting is there already, so this patch
is pretty straightforward.
There is one trick though: top level Makefile expects nand_spl to
be in nand_spl/board/$(BOARDDIR), but we can fully reuse the code
from mpc8313erdb boards, and so to not duplicate the code we just
symlink nand_spl/board/freescale/mpc8315erdb to mpc8313erdb.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
o silence make during ln echo
o update documentation
o and avoid:
$ ./MAKEALL MPC8315ERDB_NAND
Configuring for MPC8315ERDB board...
sdram.o: In function `fixed_sdram':
/home/r1aaha/git/u-boot/nand_spl/board/freescale/mpc8313erdb/sdram.c:72: undefined reference to `udelay'
by renaming udelay -> __udelay in the spirit of commit
3eb90bad651fab39cffba750ec4421a9c01d60e7 "Generic udelay() with watchdog
support".
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'board/freescale/mpc8315erdb/sdram.c')
| -rw-r--r-- | board/freescale/mpc8315erdb/sdram.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c index ead7b1e..fe8ec1e 100644 --- a/board/freescale/mpc8315erdb/sdram.c +++ b/board/freescale/mpc8315erdb/sdram.c @@ -54,6 +54,7 @@ static void resume_from_sleep(void) * This is useful for faster booting in configs where the RAM is unlikely * to be changed, or for things like NAND booting where space is tight. */ +#ifndef CONFIG_SYS_RAMBOOT static long fixed_sdram(void) { volatile immap_t *im = (volatile immap_t *)CONFIG_SYS_IMMR; @@ -68,7 +69,7 @@ static long fixed_sdram(void) * Erratum DDR3 requires a 50ms delay after clearing DDRCDR[DDR_cfg], * or the DDR2 controller may fail to initialize correctly. */ - udelay(50000); + __udelay(50000); im->ddr.csbnds[0].csbnds = (msize - 1) >> 24; im->ddr.cs_config[0] = CONFIG_SYS_DDR_CS0_CONFIG; @@ -100,6 +101,12 @@ static long fixed_sdram(void) return msize; } +#else +static long fixed_sdram(void) +{ + return CONFIG_SYS_DDR_SIZE * 1024 * 1024; +} +#endif /* CONFIG_SYS_RAMBOOT */ phys_size_t initdram(int board_type) { |