Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 190de5a3907fd47bf243aff9c469db7eb1108458..c34dca2c2dbe0ae3ec964e80c39b23df6ac355f1 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -29,6 +29,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX4                  1
 
+#define        CONFIG_MACH_TYPE                1532
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 
@@ -101,12 +103,6 @@
                                          115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE       1
 
-/*
- * Stack sizes
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE               (128*1024)      /* regular stack */
-
 /* Expansion bus settings */
 #define CONFIG_SYS_EXP_CS0                     0xbd113003
 
@@ -154,7 +150,6 @@
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
 
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY address */
 #define        CONFIG_PHY_ADDR                 0x1C
 /* MII PHY management */