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

[oweals/u-boot.git] / include / configs / smdk2410.h

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index f733c350243aafdcf03bad5d254ecc5358cbfee0..f76fa75883b964b6a793b38a75f0b197ceaf397d 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -51,7 +51,6 @@
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_OHCI_S3C24XX
 #define CONFIG_USB_KEYBOARD
-#define CONFIG_USB_STORAGE
 #define CONFIG_DOS_PARTITION
 
 /************************************************************
@@ -82,7 +81,6 @@
 /* autoboot */
 #define CONFIG_BOOT_RETRY_TIME -1
 #define CONFIG_RESET_TO_RETRY
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_IPADDR          10.0.0.110
@@ -103,8 +101,6 @@
 #define CONFIG_SYS_MAXARGS     16
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
 
-#define CONFIG_DISPLAY_CPUINFO                         /* Display cpu info */
-
 #define CONFIG_SYS_MEMTEST_START       0x30000000      /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END         0x33F00000      /* 63 MB in DRAM */
 
@@ -168,7 +164,6 @@
 /*
  * File system
  */
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE