Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 42237d373e96523fb9cb560899007abda0774550..56a23a6ef00aea5556b4bf29e8d69e4a584a8431 100644 (file)
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -16,7 +16,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
 /* Memory configuration */
@@ -48,11 +47,9 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_EHCI_MXS_PORT0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
-#define CONFIG_USB_STORAGE
 #endif
 
 /* Booting Linux */
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_BOOTARGS                "console=ttyAMA0,115200"
 #define CONFIG_BOOTCOMMAND     "bootm"