diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-29 09:25:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-29 09:25:52 +0200 |
| commit | d7b0781e2b734ff64ba71847a3ab5340ca547a51 (patch) | |
| tree | 3d7701523799c106759d9598a9977472e1f38543 /include/configs/kilauea.h | |
| parent | 03a14104f1ccd395caa774c077b4305963afebf7 (diff) | |
| parent | 042d01c72e0ea95731708dd24bb8b6cf42e75c80 (diff) | |
| download | u-boot-imx-d7b0781e2b734ff64ba71847a3ab5340ca547a51.zip u-boot-imx-d7b0781e2b734ff64ba71847a3ab5340ca547a51.tar.gz u-boot-imx-d7b0781e2b734ff64ba71847a3ab5340ca547a51.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include/configs/kilauea.h')
| -rw-r--r-- | include/configs/kilauea.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 44bcbc0..965599c 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -236,9 +236,11 @@ * * DDR Autocalibration Method_B is the default. */ +#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) #define CONFIG_PPC4xx_DDR_AUTOCALIBRATION /* IBM DDR autocalibration */ #define DEBUG_PPC4xx_DDR_AUTOCALIBRATION /* dynamic DDR autocal debug */ #undef CONFIG_PPC4xx_DDR_METHOD_A +#endif #define CONFIG_SYS_SDRAM0_MB0CF_BASE (( 0 << 20) + CONFIG_SYS_SDRAM_BASE) |