powerpc/8xxx: Add support for interactive DDR programming interface

[karo-tx-uboot.git] / arch / powerpc / cpu / mpc8xxx / ddr / main.c

diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
index 5699b0c2cc9a287ce7f4dc287b6a292ef40c32ad..f52ad9f6910296bee17f3fd60c0e473b4181b1a9 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
@@ -135,7 +135,6 @@ void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd,
  *                             |  interleaving
  */
 
-#ifdef DEBUG
 const char *step_string_tbl[] = {
        "STEP_GET_SPD",
        "STEP_COMPUTE_DIMM_PARMS",
@@ -156,7 +155,6 @@ const char * step_to_string(unsigned int step) {
 
        return step_string_tbl[s];
 }
-#endif
 
 int step_assign_addresses(fsl_ddr_info_t *pinfo,
                          unsigned int dbw_cap_adj[],
@@ -499,7 +497,12 @@ phys_size_t fsl_ddr_sdram(void)
        memset(&info, 0, sizeof(fsl_ddr_info_t));
 
        /* Compute it once normally. */
-       total_memory = fsl_ddr_compute(&info, STEP_GET_SPD, 0);
+#ifdef CONFIG_FSL_DDR_INTERACTIVE
+       if (getenv("ddr_interactive"))
+               total_memory = fsl_ddr_interactive(&info);
+       else
+#endif
+               total_memory = fsl_ddr_compute(&info, STEP_GET_SPD, 0);
 
        /* Check for memory controller interleaving. */
        memctl_interleaved = 0;