Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

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

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 71eb81c2f726792ae4a61513d57ee144462c430d..1578310bbc8b0ea02bcac9ce5f4fb3b91834812f 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -23,8 +23,6 @@
 
 #define CONFIG_SYS_TEXT_BASE   0x0
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 
 /* input clock of PLL (the SMDK2410 has 12MHz input clock) */
@@ -52,8 +50,6 @@
  ************************************************************/
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_OHCI_S3C24XX
-#define CONFIG_USB_KEYBOARD
-#define CONFIG_USB_STORAGE
 #define CONFIG_DOS_PARTITION
 
 /************************************************************
@@ -61,7 +57,6 @@
  ************************************************************/
 #define CONFIG_RTC_S3C24X0
 
-
 #define CONFIG_BAUDRATE                115200
 
 /*
@@ -75,26 +70,16 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_USB
 
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
 
 /* autoboot */
-#define CONFIG_BOOTDELAY       5
 #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
@@ -108,7 +93,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_PROMPT      "SMDK2410 # "
 #define CONFIG_SYS_CBSIZE      256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
@@ -116,8 +100,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 */
 
@@ -181,9 +163,6 @@
 /*
  * File system
  */
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE