diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-11-11 22:58:30 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-11-11 22:58:30 +0100 |
| commit | a9e9d69dd8849aa230fab88a7f3f4435713763af (patch) | |
| tree | dab10aaf1a70c5a25e1eaab021ba6eb792238808 | |
| parent | 0f365273a6c210e0d82f6dca3994be5283e6bf82 (diff) | |
| parent | 4fe5193d464ecdac26ddc71b1351be5b86bbff29 (diff) | |
| download | u-boot-imx-a9e9d69dd8849aa230fab88a7f3f4435713763af.zip u-boot-imx-a9e9d69dd8849aa230fab88a7f3f4435713763af.tar.gz u-boot-imx-a9e9d69dd8849aa230fab88a7f3f4435713763af.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
| -rw-r--r-- | cpu/ppc4xx/44x_spd_ddr2.c | 2 | ||||
| -rw-r--r-- | include/configs/canyonlands.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c index 3975306..f8aa14a 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/cpu/ppc4xx/44x_spd_ddr2.c @@ -3160,7 +3160,7 @@ inline void ppc4xx_ibm_ddr2_register_dump(void) PPC4xx_IBM_DDR2_DUMP_REGISTER(SDTR3); PPC4xx_IBM_DDR2_DUMP_REGISTER(MMODE); PPC4xx_IBM_DDR2_DUMP_REGISTER(MEMODE); - PPC4xx_IBM_DDR2_DUMP_REGISTER(ECCCR); + PPC4xx_IBM_DDR2_DUMP_REGISTER(ECCES); #if (defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT)) PPC4xx_IBM_DDR2_DUMP_REGISTER(CID); diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 3dddccf..ac9b3c5 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -593,7 +593,7 @@ #define CONFIG_SYS_EBC_PB1CR (CONFIG_SYS_FPGA_BASE | 0x3a000) /* BAS=FPGA,BS=2MB,BU=R/W,BW=16bit*/ #endif /* !defined(CONFIG_ARCHES) */ -#define CONFIG_SYS_EBC_CFG 0xB8400000 /* EBC0_CFG */ +#define CONFIG_SYS_EBC_CFG 0xbfc00000 /* * Arches doesn't use PerCS3 but GPIO43, so let's configure the GPIO |