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 <sr@denx.de>

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index a3e2fcef44404ce710c30a6fb86e7d2257ff4d40..fa226b28cb534366b6e02366a254bafe83b08956 100644 (file)
--- 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)