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

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

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index b4aad6c..7803aea 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -19,7 +19,6 @@
 #define CONFIG_ZBOOT_32
 #define CONFIG_PHYSMEM
 #define CONFIG_DISPLAY_BOARDINFO_LATE
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_LAST_STAGE_INIT
 #define CONFIG_NR_DRAM_BANKS           8
 
@@ -175,7 +174,6 @@
 #define CONFIG_USB_EHCI_PCI
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     12
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL
 
@@ -225,6 +223,5 @@
        "tftpboot $loadaddr $bootfile;"                 \
        "zboot $loadaddr"
 
-#define CONFIG_BOOTDELAY       2
 
 #endif /* __CONFIG_H */