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

[platform/kernel/u-boot.git] / include / configs / EB+MCF-EV123.h

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index f49a4b7..a8697ec 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -30,7 +30,7 @@
 #undef DEBUG
 #undef CFG_HALT_BEFOR_RAM_JUMP
 #undef ET_DEBUG
-  
+
 /*
  * High Level Configuration Options (easy to change)
  */
@@ -68,17 +68,29 @@
 #define CFG_ENV_IS_IN_FLASH    1
 #endif
 
-//#define CONFIG_COMMANDS  ( CONFIG_CMD_DFL & ~(CFG_CMD_LOADS | CFG_CMD_LOADB) )
-#define CONFIG_COMMANDS  ( CONFIG_CMD_DFL & ~(CFG_CMD_LOADB))
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_LOADB
+
 
 #define CONFIG_BOOTDELAY       5
 #define CFG_PROMPT             "\nEV123 U-Boot> "
 #define        CFG_LONGHELP                            /* undef to save memory         */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define        CFG_CBSIZE              1024            /* Console I/O Buffer Size      */
 #else
 #define        CFG_CBSIZE              256             /* Console I/O Buffer Size      */
@@ -95,12 +107,12 @@
 #undef CFG_DRAM_TEST
 
 /* Clock and PLL Configuration */
-#define CFG_HZ                 10000000 
+#define CFG_HZ                 10000000
 #define        CFG_CLK                 58982400       /* 9,8304MHz * 6 */
 
 /* PLL Configuration: Ext Clock * 6 (see table 9-4 of MCF user manual) */
 
-#define CFG_MFD                        0x01    /* PLL Multiplication Factor Devider */ 
+#define CFG_MFD                        0x01    /* PLL Multiplication Factor Devider */
 #define CFG_RFD                        0x00    /* PLL Reduce Frecuency Devider */
 
 /*
@@ -143,7 +155,7 @@
 /* If M5282 port is fully implemented the monitor base will be behind
  * the vector table. */
 #if (TEXT_BASE !=  CFG_INT_FLASH_BASE)
-#define CFG_MONITOR_BASE       (TEXT_BASE + 0x400) 
+#define CFG_MONITOR_BASE       (TEXT_BASE + 0x400)
 #else
 #define CFG_MONITOR_BASE       (TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */
 #endif