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.

---
 nand_spl/board/amcc/bamboo/sdram.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

index ac77d06..ca25252 100644
@@ -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;
 }

1.5.5.3

Hi Stefan,

You replicated the exact code change I made on my board to get things working so I believe this will fix the problem on Bamboo too.

-Eugene

Hi Eugene,

OK, thanks.

I pushed this patch to the u-boot-ppc4xx repository now.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================