From: Stefan Roese Date: Wed, 15 Apr 2009 12:06:26 +0000 (+0200) Subject: ppc4xx: Disable POST memory test on NAND-booting Sequoia X-Git-Tag: v2009.06-rc1~40 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9a929170be89b27bce677504da27e88600c06c49;hp=17c1b0e89b8be7d90f605eb19af9218c6275bfb3;p=u-boot ppc4xx: Disable POST memory test on NAND-booting Sequoia 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 --- diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index a3e2fcef44..fa226b28cb 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -301,13 +301,24 @@ #define CONFIG_SYS_POST_FPU_ON 0 #endif +/* + * 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_FPU_ON | \ + CONFIG_SYS_POST_FPU_ON | \ CONFIG_SYS_POST_I2C | \ - CONFIG_SYS_POST_MEMORY | \ + CONFIG_SYS_POST_MEMORY_ON | \ CONFIG_SYS_POST_SPR | \ CONFIG_SYS_POST_UART)