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

[people/ms/u-boot.git] / include / configs / stamp9g20.h

diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h
index 51339b1496e6180465ce9911da0366b4703ed88e..87df70bdacff664b8040f8a8ffba5ab49fd14195 100644 (file)
--- a/include/configs/stamp9g20.h
+++ b/include/configs/stamp9g20.h
@@ -140,7 +140,10 @@
  * can enable it here if your baseboard features ethernet.
  */
 
-/* #define CONFIG_MACB */
+#define CONFIG_MACB
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_MCS7830
 
 #ifdef CONFIG_MACB
 # define CONFIG_RMII                   /* use reduced MII inteface */
@@ -177,7 +180,6 @@
 /* General Boot Parameter */
 #define CONFIG_BOOTDELAY               3
 #define CONFIG_BOOTCOMMAND             "run flashboot"
-#define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE \
@@ -229,12 +231,6 @@
                "bootm 22000000"
 
 /* Command line & features configuration */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
@@ -243,10 +239,6 @@
 #ifdef CONFIG_MACB
 # define CONFIG_CMD_PING
 # define CONFIG_CMD_DHCP
-#else
-# undef CONFIG_CMD_BOOTD
-# undef CONFIG_CMD_NET
-# undef CONFIG_CMD_NFS
 #endif /* CONFIG_MACB */
 
 #endif /* __CONFIG_H */