summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-09-11 00:37:04 +0200
committerMichal Simek <monstr@monstr.eu>2007-09-11 00:37:04 +0200
commitd45963854eff39d575124d859419bb4953ce2c87 (patch)
tree50d214f83201434e7c8ed2d7684d6e10c8a3283d
parent9c73f4b81172bc9f1b8f132450e69bcfb5b960ca (diff)
downloadu-boot-imx-d45963854eff39d575124d859419bb4953ce2c87.zip
u-boot-imx-d45963854eff39d575124d859419bb4953ce2c87.tar.gz
u-boot-imx-d45963854eff39d575124d859419bb4953ce2c87.tar.bz2
[FIX] Microblaze ML401 - repare FLASH handling
-rw-r--r--include/configs/ml401.h26
1 files changed, 16 insertions, 10 deletions
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 0059939..74fe888 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -146,6 +146,16 @@
#define CFG_FLASH_PROTECTION /* hardware flash protection */
#endif /* !FLASH */
+/* system ace */
+#ifdef XILINX_SYSACE_BASEADDR
+ #define CONFIG_SYSTEMACE
+ /* #define DEBUG_SYSTEMACE */
+ #define SYSTEMACE_CONFIG_FPGA
+ #define CFG_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
+ #define CFG_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
+ #define CONFIG_DOS_PARTITION
+#endif
+
/*
* BOOTP options
*/
@@ -161,12 +171,14 @@
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MFSL
#define CONFIG_CMD_PING
+#if defined(CONFIG_SYSTEMACE)
+ #define CONFIG_CMD_EXT2
+ #define CONFIG_CMD_FAT
+#endif
#if defined(FLASH)
#define CONFIG_CMD_ECHO
@@ -178,6 +190,8 @@
#define CONFIG_CMD_ENV
#define CONFIG_CMD_SAVES
#endif
+#else
+ #undef CONFIG_CMD_FLASH
#endif
#if defined(CONFIG_CMD_JFFS2)
@@ -212,14 +226,6 @@
#define CFG_USR_EXCEP /* user exception */
#define CFG_HZ 1000
-/* system ace */
-#define CONFIG_SYSTEMACE
-/* #define DEBUG_SYSTEMACE */
-#define SYSTEMACE_CONFIG_FPGA
-#define CFG_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
-#define CFG_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
-#define CONFIG_DOS_PARTITION
-
#define CONFIG_PREBOOT "echo U-BOOT for ML401;setenv preboot;echo"
#define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" /* hardware flash protection */\