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

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

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index c36e444a6cc91a1919e5bf83c9d6672c9c12fae3..42925665928046a03f6ba4fb3e3d7c63a529ba7a 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -25,9 +25,6 @@
 
 #define CONFIG_ARCH_CPU_INIT
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* input clock of PLL: SMDKC100 has 12MHz input clock */
 #define CONFIG_SYS_CLK_FREQ            12000000
 
@@ -65,16 +62,10 @@
  ***********************************************************/
 #undef CONFIG_CMD_NAND
 
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_MTDPARTS
 
-#define CONFIG_BOOTDELAY       3
-
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
@@ -150,7 +141,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser    */
 #define CONFIG_SYS_CBSIZE      256     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE      384     /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS     16      /* max number of command args */
@@ -174,7 +164,6 @@
 #define CONFIG_SYS_NO_FLASH            1
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* 256 KiB */
-#define CONFIG_IDENT_STRING            " for SMDKC100"
 
 #if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)
 #define CONFIG_ENABLE_MMU
@@ -212,7 +201,4 @@
 #define CONFIG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
 #endif /* CONFIG_CMD_NET */
 
-#define CONFIG_OF_LIBFDT
-
-
 #endif /* __CONFIG_H */