]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
powerpc/ddr: fix fsl_ddr_get_dimm_params compile error
authorShaohui Xie <Shaohui.Xie@freescale.com>
Thu, 28 Jun 2012 23:36:38 +0000 (23:36 +0000)
committerAndy Fleming <afleming@freescale.com>
Wed, 8 Aug 2012 22:13:38 +0000 (17:13 -0500)
fsl_ddr_get_dimm_params() should be wrapped by
CONFIG_SYS_DDR_RAW_TIMING, otherwise, when using fixed_sdram() instead of
using SPD, it will cause compile error.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
arch/powerpc/cpu/mpc8xxx/ddr/main.c

index f52ad9f6910296bee17f3fd60c0e473b4181b1a9..c2a03e334cfa50db43970aef9440de3601695565 100644 (file)
@@ -366,7 +366,7 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,
                        }
                }
 
-#else
+#elif defined(CONFIG_SYS_DDR_RAW_TIMING)
        case STEP_COMPUTE_DIMM_PARMS:
                for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) {
                        for (j = 0; j < CONFIG_DIMM_SLOTS_PER_CTLR; j++) {