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

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

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 828bc601aa944404b27467b4f469f62755322c6a..e8dca0b2ccdca731d2022e472a564a65b315b9ee 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -59,9 +59,7 @@
 
 /* Define which commands should be available at u-boot command prompt */
 
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_I2C
 #if ENABLE_JFFS
 #define CONFIG_CMD_JFFS2
 #endif
@@ -69,8 +67,6 @@
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_SYS_HUSH_PARSER
-
 #define CONFIG_MCFRTC
 #undef RTC_DEBUG
 
@@ -152,19 +148,6 @@
 
 /* AUTOBOOT settings - booting images automatically by u-boot after power on */
 
-/*
- * used for autoboot, delay in seconds u-boot will wait before starting
- * defined (auto-)boot command, setting to -1 disables delay, setting to
- * 0 will too prevent access to u-boot command interface: u-boot then has
- * to be reflashed
- * beware - watchdog is not serviced during autoboot delay time!
- */
-#ifdef CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_BOOTDELAY       1
-#else
-#define CONFIG_BOOTDELAY       1
-#endif
-
 /*
  * The following settings will be contained in the environment block ; if you
  * want to use a neutral environment all those settings can be manually set in