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

[platform/kernel/u-boot.git] / include / configs / edb93xx.h

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 37bdcc0..7bc58dc 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for Cirrus Logic EDB93xx boards
+ * U-Boot - Configuration file for Cirrus Logic EDB93xx boards
  */
 
 #ifndef __CONFIG_H
@@ -25,6 +25,7 @@
 #error "no board defined"
 #endif
 
+
 /* Initial environment and monitor configuration options. */
 #define CONFIG_BOOTDELAY               2
 #define CONFIG_CMDLINE_TAG             1
@@ -39,7 +40,7 @@
 
 #define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
 
-
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_EDB9301
 #define CONFIG_EP9301
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9301
@@ -85,19 +86,12 @@
 #endif
 
 /* High-level configuration options */
-#define CONFIG_ARM920T         1               /* This is an ARM920T core... */
-#define CONFIG_EP93XX          1               /* in a Cirrus Logic 93xx SoC */
+#define CONFIG_EP93XX          1               /* This is a Cirrus Logic 93xx SoC */
 
 #define CONFIG_SYS_CLK_FREQ    14745600        /* EP93xx has a 14.7456 clock */
-#define CONFIG_SYS_HZ          1000            /* decr freq: 1 ms ticks */
 #undef CONFIG_USE_IRQ                          /* Don't need IRQ/FIQ */
 
 /* Monitor configuration */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_JFFS2
@@ -144,7 +138,6 @@
 #define CONFIG_MII_SUPPRESS_PREAMBLE
 #define CONFIG_MII
 #define CONFIG_PHY_ADDR                1
-#define CONFIG_NET_MULTI
 #undef CONFIG_NETCONSOLE
 
 /* SDRAM configuration */