Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd

[u-boot] / cpu / ppc4xx / spd_sdram.c

diff --git a/cpu/ppc4xx/spd_sdram.c b/cpu/ppc4xx/spd_sdram.c
index ebd5f3998f3998ea35caeabd568df049c0e14f99..c24456bea845d0da7dcf9ecd6e8d21a7a94827a5 100644 (file)
--- a/cpu/ppc4xx/spd_sdram.c
+++ b/cpu/ppc4xx/spd_sdram.c
@@ -745,7 +745,7 @@ long int spd_sdram(void) {
         */
        check_volt_type(dimm_populated, iic0_dimm_addr, num_dimm_banks);
 
-#if defined(CONFIG_440GX)
+#if defined(CONFIG_440GX) || defined(CONFIG_440EP) || defined(CONFIG_440GR) || defined(CONFIG_440SP)
        /*
         * Soft-reset SDRAM controller.
         */
@@ -1007,9 +1007,9 @@ void program_cfg0(unsigned long* dimm_populated,
        }
 
        /*
-        * program Page Management Unit
+        * program Page Management Unit (0 == enabled)
         */
-       cfg0 |= SDRAM_CFG0_PMUD;
+       cfg0 &= ~SDRAM_CFG0_PMUD;
 
        /*
         * program Memory Controller Options 0