Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

[u-boot] / include / configs / mx1ads.h

diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index f136b0ca8c6e2b8487edfcdaa3086c609265b1e2..166da6ca7fd6f2e17122d9c26faddd3cce298a41 100644 (file)
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -40,6 +40,7 @@
 /*
  * Select serial console configuration
   */
+#define CONFIG_IMX_SERIAL
 #define CONFIG_IMX_SERIAL1             /* internal uart 1 */
 /* #define _CONFIG_UART2 */            /* internal uart 2 */
 /* #define CONFIG_SILENT_CONSOLE */    /* use this to disable output */
@@ -59,15 +60,13 @@
 
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
 
-
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
-
 /*
  *  CS8900 Ethernet drivers
  */
-#define CONFIG_DRIVER_CS8900   1       /* we have a CS8900 on-board */
-#define CS8900_BASE            0x15000300
-#define CS8900_BUS16           1       /* the Linux driver does accesses as shorts */
+#define CONFIG_NET_MULTI
+#define CONFIG_CS8900          /* we have a CS8900 on-board */
+#define CONFIG_CS8900_BASE     0x15000300
+#define CONFIG_CS8900_BUS16    /* the Linux driver does accesses as shorts */
 
 /*
  * select serial console configuration
@@ -78,7 +77,6 @@
 
 #define CONFIG_BAUDRATE                115200
 
-
 /*
  * BOOTP options
  */
@@ -87,7 +85,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
@@ -97,7 +94,6 @@
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ELF
 
-
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "root=/dev/msdk mem=48M"
 #define CONFIG_BOOTFILE                "mx1ads"
@@ -133,7 +129,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x09000000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0x0AF00000      /* 63 MB in DRAM        */
 
-#undef CONFIG_SYS_CLKS_IN_HZ                           /* everything, incl board info, in Hz */
 #define CONFIG_SYS_LOAD_ADDR           0x08800000      /* default load address */
 /*#define      CONFIG_SYS_HZ                   1000 */
 #define CONFIG_SYS_HZ                  3686400