Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev

[platform/kernel/u-boot.git] / include / configs / ml401.h

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 0059939..b320438 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007 Czech Technical University.
+ * (C) Copyright 2007 Michal Simek
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
@@ -32,7 +32,7 @@
 #define        CONFIG_ML401            1       /* ML401 Board */
 
 /* uart */
-#define        XILINX_UARTLITE
+#define        CONFIG_XILINX_UARTLITE
 #define        CONFIG_SERIAL_BASE      XILINX_UART_BASEADDR
 #define        CONFIG_BAUDRATE         XILINX_UART_BAUDRATE
 #define        CFG_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
@@ -59,6 +59,7 @@
 #define        CFG_TIMER_0_IRQ         XILINX_TIMER_IRQ
 #define        FREQUENCE               XILINX_CLOCK_FREQ
 #define        CFG_TIMER_0_PRELOAD     ( FREQUENCE/1000 )
+#define        CONFIG_XILINX_CLOCK_FREQ        XILINX_CLOCK_FREQ
 
 /* FSL */
 #define        CFG_FSL_2
@@ -146,6 +147,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 +172,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 +191,8 @@
                #define CONFIG_CMD_ENV
                #define CONFIG_CMD_SAVES
        #endif
+#else
+       #undef CONFIG_CMD_FLASH
 #endif
 
 #if defined(CONFIG_CMD_JFFS2)
@@ -212,14 +227,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 */\