diff options
| author | Stefan Roese <sr@denx.de> | 2008-06-04 19:19:20 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-06-04 21:34:12 +0200 |
| commit | 63a0afa0c32e5f4ea98a9439542870072437404d (patch) | |
| tree | d9f9c0d78e6c32a6ef67ce9ac98fac93d3a05933 /nand_spl | |
| parent | de5bfcf7b0425e032be12698252dbaa6b65a28c0 (diff) | |
| download | blackbird-obmc-uboot-63a0afa0c32e5f4ea98a9439542870072437404d.tar.gz blackbird-obmc-uboot-63a0afa0c32e5f4ea98a9439542870072437404d.zip | |
ppc4xx: Fix problem with SDRAM init in bamboo NAND booting port
This patch fixes a problem spotted by Eugene O'Brian (thanks Eugene)
introduced by the commit:
ppc4xx/NAND_SPL: Consolidate 405 and 440 NAND booting code in start.S
With this patch SDRAM will get initialized again and booting from NAND
is working again.
Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Eugene O'Brien <eugene.obrien@advantechamt.com>
Diffstat (limited to 'nand_spl')
| -rw-r--r-- | nand_spl/board/amcc/bamboo/sdram.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c index ac77d066cb..ca25252edf 100644 --- a/nand_spl/board/amcc/bamboo/sdram.c +++ b/nand_spl/board/amcc/bamboo/sdram.c @@ -36,7 +36,7 @@ static void wait_init_complete(void) } /* - * early_sdram_init() + * long int initdram(int board_type) * * As the name already indicates, this function is called very early * from start.S and configures the SDRAM with fixed values. This is needed, @@ -51,7 +51,7 @@ static void wait_init_complete(void) * modules are still plugged in. So it is recommended to remove the DIMM * modules while using the NAND booting code with the fixed SDRAM setup! */ -void early_sdram_init(void) +long int initdram(int board_type) { /* * Soft-reset SDRAM controller. @@ -87,12 +87,6 @@ void early_sdram_init(void) */ mtsdram(mem_cfg0, 0x80000000); /* DCEN=1, PMUD=0*/ wait_init_complete(); -} -long int initdram(int board_type) -{ - /* - * Nothing to do here, just return size of fixed SDRAM setup - */ return CFG_MBYTES_SDRAM << 20; } |
