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 1be7dd46a7df35a5b219f33d7d3338b438f654e9..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
-
 /*
  * 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       */
 
 /*