diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-08-09 21:04:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-08-09 21:04:05 +0200 |
| commit | 1d56f63dab2d9b1ea60601f5f3ae22d8664d8aa5 (patch) | |
| tree | 249c74a50e495c32d6b8f387112f712430e38d22 /arch/powerpc/cpu/mpc8xxx/ddr/main.c | |
| parent | d764c5043d6d72e012f3e50092344ebd57a0c242 (diff) | |
| parent | 5c5befda58e4a3f198a033e8a9952b2b309acc86 (diff) | |
| download | blackbird-obmc-uboot-1d56f63dab2d9b1ea60601f5f3ae22d8664d8aa5.tar.gz blackbird-obmc-uboot-1d56f63dab2d9b1ea60601f5f3ae22d8664d8aa5.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx:
powerpc/85xx: use CONFIG_SYS_FSL_PCIE_COMPAT macro when setting the PCI LIODNs
powerpc/mpc85xx: Ignore E bit for BSC9130/1
powerpc/sgmii: To support PHY link state auto detect in SGMII mode
powerpc/85xx: improve definition of BR_PHYS_ADDR macro
powerpc/p2041: configure the CPLD lane_mux according to RCW
powerpc/ddr: fix fsl_ddr_get_dimm_params compile error
powerpc/corenet: fix compile error when CONFIG_SYS_NO_FLASH is defined
powerpc/mpc8xxx: fix workaround for errata DDR111 and DDR134 for DDR over 4GB
powerpc/p1022ds: fix DIU/LBC switching with NAND enabled
powerpc/p1022ds: add support for SPI and SD boot
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/cpu/mpc8xxx/ddr/main.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xxx/ddr/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c index f52ad9f691..c2a03e334c 100644 --- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c +++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c @@ -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++) { |
