summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2009-04-15 14:06:26 +0200
committerStefan Roese <sr@denx.de>2009-04-16 09:12:08 +0200
commit9a929170be89b27bce677504da27e88600c06c49 (patch)
treef7d72422a7fc3ec45d27b36e0a8ae8df41369098 /include
parent17c1b0e89b8be7d90f605eb19af9218c6275bfb3 (diff)
downloadu-boot-imx-9a929170be89b27bce677504da27e88600c06c49.zip
u-boot-imx-9a929170be89b27bce677504da27e88600c06c49.tar.gz
u-boot-imx-9a929170be89b27bce677504da27e88600c06c49.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sequoia.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index a3e2fce..fa226b2 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)