ppc4xx: Move ppc4xx headers to powerpc include directory

[karo-tx-uboot.git] / nand_spl / board / amcc / bamboo / sdram.c

diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c
index 4f09072df08942fe3f144230e42e11cc02f9bf3f..504a02b9e8c4d89937855468015e44d71d495b53 100644 (file)
--- a/nand_spl/board/amcc/bamboo/sdram.c
+++ b/nand_spl/board/amcc/bamboo/sdram.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 
@@ -31,12 +31,12 @@ static void wait_init_complete(void)
        u32 val;
 
        do {
-               mfsdram(mem_mcsts, val);
+               mfsdram(SDRAM0_MCSTS, val);
        } while (!(val & 0x80000000));
 }
 
 /*
- * early_sdram_init()
+ * phys_size_t 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,
@@ -44,49 +44,49 @@ static void wait_init_complete(void)
  * not enough free space to implement the complete I2C SPD DDR autodetection
  * routines. Therefore the Bamboo only supports the onboard 64MBytes of SDRAM
  * when booting from NAND flash.
+ *
+ * Note:
+ * As found out by Eugene O'Brien <eugene.obrien@advantechamt.com>, the fixed
+ * DDR setup has problems (U-Boot crashes randomly upon TFTP), when the DIMM
+ * 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)
+phys_size_t initdram(int board_type)
 {
        /*
         * Soft-reset SDRAM controller.
         */
-       mtsdr(sdr_srst, SDR0_SRST_DMC);
-       mtsdr(sdr_srst, 0x00000000);
+       mtsdr(SDR0_SRST, SDR0_SRST_DMC);
+       mtsdr(SDR0_SRST, 0x00000000);
 
        /*
         * Disable memory controller.
         */
-       mtsdram(mem_cfg0, 0x00000000);
+       mtsdram(SDRAM0_CFG0, 0x00000000);
 
        /*
         * Setup some default
         */
-       mtsdram(mem_uabba, 0x00000000); /* ubba=0 (default)             */
-       mtsdram(mem_slio, 0x00000000);  /* rdre=0 wrre=0 rarw=0         */
-       mtsdram(mem_devopt, 0x00000000); /* dll=0 ds=0 (normal)         */
-       mtsdram(mem_wddctr, 0x00000000); /* wrcp=0 dcd=0                */
-       mtsdram(mem_clktr, 0x40000000); /* clkp=1 (90 deg wr) dcdt=0    */
+       mtsdram(SDRAM0_UABBA, 0x00000000); /* ubba=0 (default)          */
+       mtsdram(SDRAM0_SLIO, 0x00000000);       /* rdre=0 wrre=0 rarw=0         */
+       mtsdram(SDRAM0_DEVOPT, 0x00000000); /* dll=0 ds=0 (normal)              */
+       mtsdram(SDRAM0_WDDCTR, 0x00000000); /* wrcp=0 dcd=0             */
+       mtsdram(SDRAM0_CLKTR, 0x40000000); /* clkp=1 (90 deg wr) dcdt=0 */
 
        /*
         * Following for CAS Latency = 2.5 @ 133 MHz PLB
         */
-       mtsdram(mem_b0cr, 0x00082001);
-       mtsdram(mem_tr0, 0x41094012);
-       mtsdram(mem_tr1, 0x8080083d);   /* SS=T2 SL=STAGE 3 CD=1 CT=0x00*/
-       mtsdram(mem_rtr, 0x04100000);   /* Interval 7.8µs @ 133MHz PLB  */
-       mtsdram(mem_cfg1, 0x00000000);  /* Self-refresh exit, disable PM*/
+       mtsdram(SDRAM0_B0CR, 0x00082001);
+       mtsdram(SDRAM0_TR0, 0x41094012);
+       mtsdram(SDRAM0_TR1, 0x8080083d);        /* SS=T2 SL=STAGE 3 CD=1 CT=0x00*/
+       mtsdram(SDRAM0_RTR, 0x04100000);        /* Interval 7.8µs @ 133MHz PLB  */
+       mtsdram(SDRAM0_CFG1, 0x00000000);       /* Self-refresh exit, disable PM*/
 
        /*
         * Enable the controller, then wait for DCEN to complete
         */
-       mtsdram(mem_cfg0, 0x80000000); /* DCEN=1, PMUD=0*/
+       mtsdram(SDRAM0_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;
+       return CONFIG_SYS_MBYTES_SDRAM << 20;
 }