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

[platform/kernel/u-boot.git] / include / configs / smartweb.h

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index d189c3f..d06e648 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -49,11 +49,18 @@
 #define CONFIG_BOARD_EARLY_INIT_F      /* call board_early_init_f() */
 #define CONFIG_DISPLAY_CPUINFO         /* display CPU Info at startup */
 
+/* We set the max number of command args high to avoid HUSH bugs. */
+#define CONFIG_SYS_MAXARGS    32
+
 /* setting board specific options */
-# define CONFIG_MACH_TYPE              MACH_TYPE_SMARTWEB
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_CMDLINE_EDITING
+#define CONFIG_MACH_TYPE               MACH_TYPE_SMARTWEB
 #define CONFIG_AUTO_COMPLETE
+#define CONFIG_ENV_OVERWRITE    1 /* Overwrite ethaddr / serial# */
+#define CONFIG_SYS_HUSH_PARSER    /* use "hush" command parser */
+#define CONFIG_SYS_PROMPT_HUSH_PS2  "> "
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_AUTOLOAD "yes"
+#define CONFIG_RESET_TO_RETRY
 
 /* The LED PINs */
 #define CONFIG_RED_LED                 AT91_PIN_PA9
@@ -117,6 +124,9 @@
  *
  */
 #define CONFIG_MACB
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_MCS7830
 #define CONFIG_RMII                    /* use reduced MII inteface */
 #define CONFIG_NET_RETRY_COUNT 20      /* # of DHCP/BOOTP retries */
 #define CONFIG_AT91_WANTS_COMMON_PHY
@@ -183,7 +193,6 @@
 #define CONFIG_BOOTDELAY               3
 #define CONFIG_BOOTCOMMAND             "run flashboot"
 #define CONFIG_SYS_CBSIZE              512
-#define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_LONGHELP
@@ -232,12 +241,7 @@
 # undef CONFIG_CMD_NFS
 #endif /* CONFIG_MACB */
 
-#if !defined(CONFIG_SPL_BUILD)
-/* Enable Device-Tree (FDT) support */
-#define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_FDT
-#define CONFIG_FIT
-#endif
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SYS_INIT_SP_ADDR                0x301000