Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 75e1d1ce667bb924b9ec7f4ba87e521d583b9944..3901fb672b4ef2e78099cea1eb00990c52d597f1 100644 (file)
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -14,7 +14,6 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
 
 #ifndef CONFIG_INTERNAL_UART
 /* Use BayTrail internal HS UART which is memory-mapped */
@@ -25,36 +24,13 @@
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 
-#define CONFIG_SCSI_DEV_LIST           \
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
-
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC_SDMA
-
-#undef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_ETHER_SMSC95XX
-#define CONFIG_USB_ETHER_MCS7830
-#define CONFIG_USB_ETHER_RTL8152
-
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
-#define CONFIG_CMD_BMP
 
 #define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OFFSET              0x006ef000
 
-#undef CONFIG_BOOTARGS
 #undef CONFIG_BOOTCOMMAND
-
-#define CONFIG_BOOTARGS                \
-       "root=/dev/sda1 ro quiet"
 #define CONFIG_BOOTCOMMAND     \
        "load scsi 0:1 03000000 /boot/vmlinuz-${kernel-ver}-generic;"   \
        "load scsi 0:1 04000000 /boot/initrd.img-${kernel-ver}-generic;" \