Merge branch 'tx28-update' into tx28-bugfix

[karo-tx-uboot.git] / include / configs / ac14xx.h

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index f57820d8f59ad8ebc65894ef740f1c6de8274149..f05d9ecd149f424c5e03682a872f8e641057fb29 100644 (file)
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -13,6 +13,9 @@
 #define __CONFIG_H
 
 #define CONFIG_AC14XX 1
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_GENERIC_BOARD
+
 /*
  * Memory map for the ifm AC14xx board:
  *
@@ -369,7 +372,6 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC             1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                        0x1F
 #define CONFIG_MII                     1       /* MII PHY management */
 #define CONFIG_FEC_AN_TIMEOUT          1
@@ -392,8 +394,6 @@
 #define CONFIG_LOADS_ECHO              1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
@@ -403,7 +403,6 @@
 #undef CONFIG_CMD_EXT2
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
@@ -422,7 +421,6 @@
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
-#define CONFIG_SYS_PROMPT      "ac14xx> "      /* Monitor Command Prompt */
 
 #ifdef CONFIG_CMD_KGDB
 # define CONFIG_SYS_CBSIZE     1024            /* Console I/O Buffer Size */