Merge branch 'master' of git://git.denx.de/u-boot-marvell

[u-boot] / arch / powerpc / cpu / mpc8xxx / ddr / options.c

diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/options.c b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
index 1d5f3e2cdd4d492cb2a164ff178feaa34ef22c13..774c0e4b42f249f6aa02ff14002bccd388513eb0 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/ddr/options.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
@@ -204,6 +204,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
         * meet the tQDSS under different loading.
         */
        popts->wrlvl_en = 1;
+       popts->zq_en = 1;
        popts->wrlvl_override = 0;
 #endif
 
@@ -341,6 +342,13 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
                }
        }
 
+       if (hwconfig_sub("fsl_ddr", "addr_hash")) {
+               if (hwconfig_subarg_cmp("fsl_ddr", "addr_hash", "null"))
+                       popts->addr_hash = 0;
+               else if (hwconfig_subarg_cmp("fsl_ddr", "addr_hash", "true"))
+                       popts->addr_hash = 1;
+       }
+
        if (pdimm[0].n_ranks == 4)
                popts->quad_rank_present = 1;