diff options
| author | Stefan Roese <sr@denx.de> | 2009-04-15 14:08:48 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2009-04-16 09:12:08 +0200 |
| commit | dd7c302099ef5590069bdbf292aaa8230cd59de7 (patch) | |
| tree | 3e9cef8562c592861f043dd972eccd5a4ceda7aa /include/configs/kilauea.h | |
| parent | 9a929170be89b27bce677504da27e88600c06c49 (diff) | |
| download | talos-obmc-uboot-dd7c302099ef5590069bdbf292aaa8230cd59de7.tar.gz talos-obmc-uboot-dd7c302099ef5590069bdbf292aaa8230cd59de7.zip | |
ppc4xx: Disable POST memory test on NAND-booting Kilauea
Don't run the memory POST on the NAND-booting version. It will
overwrite part of the U-Boot image which is already loaded from NAND
to SDRAM. We were just lucky that it booted at all with this SDRAM
test enabled.
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/kilauea.h')
| -rw-r--r-- | include/configs/kilauea.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 26cb854394..97bac99597 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -430,12 +430,23 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_SNTP +/* + * Don't run the memory POST on the NAND-booting version. It will + * overwrite part of the U-Boot image which is already loaded from NAND + * to SDRAM. + */ +#if defined(CONFIG_NAND_U_BOOT) +#define CONFIG_SYS_POST_MEMORY_ON 0 +#else +#define CONFIG_SYS_POST_MEMORY_ON CONFIG_SYS_POST_MEMORY +#endif + /* POST support */ #define CONFIG_POST (CONFIG_SYS_POST_CACHE | \ CONFIG_SYS_POST_CPU | \ CONFIG_SYS_POST_ETHER | \ CONFIG_SYS_POST_I2C | \ - CONFIG_SYS_POST_MEMORY | \ + CONFIG_SYS_POST_MEMORY_ON | \ CONFIG_SYS_POST_UART) /* Define here the base-addresses of the UARTs to test in POST */ |
