Merge with /home/mk/11-cmb1920/u-boot#4upstream

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

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index 10f69d998e038ad99fc63a0f6c5d330dba66c030..825bfd14e93bb5e9646880872a002381fe58e1f3 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -28,12 +28,6 @@
 #ifndef __CONFIG_H
 #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)
@@ -125,9 +119,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 +324,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)