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

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

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 2c2c0776d5a2a59a9115d8a783319df38b05c82f..041ca219da918530d122d179aec5c5f42e38fb69 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -124,7 +124,6 @@
 #define CONFIG_MACB
 #define CONFIG_RESET_PHY_R
 
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         20
 
 /* USB */
@@ -158,7 +157,6 @@
                                "rw rootfstype=jffs2 panic=20"
 
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SYS_BAUDRATE_TABLE      {115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_SYS_CBSIZE              256
@@ -172,9 +170,4 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
 
-#define CONFIG_STACKSIZE       (32 * 1024)     /* regular stack */
-
-#ifdef CONFIG_USE_IRQ
-#error CONFIG_USE_IRQ not supported
-#endif
 #endif