Convert CONFIG_SPL_SERIAL_SUPPORT to Kconfig

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

diff --git a/include/configs/x600.h b/include/configs/x600.h
index d7da0b295b6b7ae61d7414c06722380091e12689..574f00c5c0bbaae381ced5afbb5352613c6b4f8c 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -80,12 +80,13 @@
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_ADDR                0       /* PHY address */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */
+#define CONFIG_PHY_MICREL
+#define CONFIG_PHY_MICREL_KSZ9031
 
 #define CONFIG_SPEAR_GPIO
 
 /* I2C config options */
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_DW
 #define CONFIG_SYS_I2C_BASE                    0xD0200000
 #define CONFIG_SYS_I2C_SPEED                   400000
 #define CONFIG_SYS_I2C_SLAVE                   0x02
@@ -103,7 +104,6 @@
 /* USB EHCI options */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_SPEAR
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /*
@@ -123,7 +123,6 @@
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_BOOTDELAY                       3
 
 /*
  * U-Boot Environment placing definitions.
@@ -145,7 +144,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MX_CYCLIC               /* enable mdc/mwc commands      */
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
@@ -269,10 +267,6 @@
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds"
 
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_NOR_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_LIBCOMMON_SUPPORT   /* image.c */
-#define CONFIG_SPL_LIBGENERIC_SUPPORT  /* string.c */
 
 /*
  * Please select/define only one of the following