Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index 825bfd1..aac03a1 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -81,14 +81,26 @@
 
 #define CONFIG_BAUDRATE                115200
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_ELF    | \
-                                CFG_CMD_EEPROM | \
-                                CFG_CMD_DATE   | \
-                                CFG_CMD_I2C    )
 
-/* 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>
+
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_I2C
+
 
 #define CONFIG_BOOTDELAY       3
 
@@ -172,10 +184,10 @@
 #define CFG_FLASH_UNLOCK_TOUT  (2*CFG_HZ)      /* Timeout for Flash Clear Lock Bits */
 #define CFG_FLASH_PROTECTION                   /* "Real" (hardware) sectors protection */
 
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x40000)        /* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           0x4000
-#define CFG_ENV_SECT_SIZE      0x40000                         /* Size of the Environment Sector       */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x40000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x40000                         /* Size of the Environment Sector       */
 #define CFG_MONITOR_LEN                0x20000                         /* 128 KiB */
 
 /******************************************************************************