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

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

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 1039762..ec73224 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -64,15 +64,29 @@
 
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
 
-#define CONFIG_COMMANDS               ((CONFIG_CMD_DFL & ~CFG_CMD_DTT) | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_DIAG    | \
-                               CFG_CMD_NFS     | \
-                               CFG_CMD_SDRAM   | \
-                               CFG_CMD_SNTP    )
 
-/* 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_DHCP
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_SNTP
+
+#undef CONFIG_CMD_DTT
+
 
 #define CONFIG_ETHADDR         08:00:3e:26:0a:5b
 #define CONFIG_NETMASK         255.255.255.0
@@ -83,10 +97,10 @@
 #define CONFIG_BOOTCOMMAND     "bootm 0x00100000"
 #define CONFIG_BOOTARGS                "console=ttyS1,115200"
 #define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS       1
+#define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200                  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  1                       /* which serial port to use */
 #endif
@@ -95,7 +109,7 @@
  * Size of malloc() pool; this lives below the uppermost 128 KiB which are
  * used for the RAM copy of the uboot code
  */
-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
@@ -162,9 +176,9 @@
 #define CFG_FLASH_WRITE_TOUT   (25*CFG_HZ) /* Timeout for Flash Write */
 
 /* FIXME */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           0x40000                 /* Total Size of 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                0x40000                 /* Total Size of Environment Sector     */
 
 /*
  * Stack sizes