Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev

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

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index 10f69d9..bcd16ec 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -29,12 +29,6 @@
 #define __CONFIG_H
 
 /*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-
-/*
  * High Level Configuration Options
  * (easy to change)
  */
@@ -87,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
 
@@ -125,9 +131,9 @@
 /*
  * Definitions related to passing arguments to kernel.
  */
-#define CONFIG_CMDLINE_TAG          1   /* send commandline to Kernel          */
-#define CONFIG_SETUP_MEMORY_TAGS     1  /* send memory definition to kernel    */
-#undef CONFIG_INITRD_TAG                /* do not send initrd params           */
+#define CONFIG_CMDLINE_TAG      1       /* send commandline to Kernel          */
+#define CONFIG_SETUP_MEMORY_TAGS 1      /* send memory definition to kernel    */
+#define        CONFIG_INITRD_TAG        1       /* do not send initrd params           */
 #undef CONFIG_VFD                       /* do not send framebuffer setup       */
 
 /*
@@ -330,7 +336,7 @@
 #define CFG_MSC2_VAL       0x35f435fc  /* IDE     / BCR + WatchDog (cs4)/(cS5)   */
 #define CFG_MDCNFG_VAL     0x000009c9
 #define CFG_MDMRS_VAL      0x00220022
-#define CFG_MDREFR_VAL     0x000da018  /* Initial setting, individual bits set in memsetup.S */
+#define CFG_MDREFR_VAL     0x000da018  /* Initial setting, individual bits set in lowlevel_init.S */
 
 /*
  * PCMCIA and CF Interfaces (NOT USED, these values from lubbock init)