Prepare for SoC rework of ARM code:

- rename CONFIG_BOOTBINFUNC into  CONFIG_INIT_CRITICAL
- rename memsetup into lowlevel_init (function name and source files)

37 files changed, 50 insertions, 63 deletions

diff --git a/include/configs/B2.h b/include/configs/B2.h
index 2fc97b27c2e..b031826f3f9 100644
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -34,7 +34,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index de7f387817f..7c51a1b040f 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -27,7 +27,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 9ca80ab6707..2c664d59366 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -33,7 +33,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 8146fe723d6..d32ec34fc2a 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -29,7 +29,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /* ARM asynchronous clock */
 #define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
@@ -44,10 +44,7 @@
 #define CONFIG_SETUP_MEMORY_TAGS 1
 #define CONFIG_INITRD_TAG	1
 
-/* define this to include the functionality of boot.bin in u-boot */
-#undef CONFIG_BOOTBINFUNC
-
-#ifdef CONFIG_BOOTBINFUNC
+#ifdef CONFIG_INIT_CRITICAL
 #define CFG_USE_MAIN_OSCILLATOR		1
 /* flash */
 #define MC_PUIA_VAL	0x00000000
@@ -77,7 +74,7 @@
 #define SDRC_MR_VAL2	0x00000003 /* Load Mode Register */
 #define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
-#endif
+#endif	/* CONFIG_INIT_CRITICAL */
 /*
  * Size of malloc() pool
  */
@@ -180,19 +177,19 @@
 #define CFG_ENV_SIZE			0x2000  /* 0x8000 */
 #else
 #define CFG_ENV_IS_IN_FLASH		1
-#ifdef CONFIG_BOOTBINFUNC
+#ifdef CONFIG_INIT_CRITICAL
 #define CFG_ENV_ADDR			(PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
 #define CFG_ENV_SIZE			0x10000 /* sectors are 64K here */
 #else
 #define CFG_ENV_ADDR			(PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
 #define CFG_ENV_SIZE			0x2000  /* 0x8000 */
-#endif
-#endif
+#endif	/* CONFIG_INIT_CRITICAL */
+#endif	/* CFG_ENV_IS_IN_DATAFLASH */
 
 
 #define CFG_LOAD_ADDR		0x21000000  /* default load address */
 
-#ifdef CONFIG_BOOTBINFUNC
+#ifdef CONFIG_INIT_CRITICAL
 #define CFG_BOOT_SIZE		0x00 /* 0 KBytes */
 #define CFG_U_BOOT_BASE		PHYS_FLASH_1
 #define CFG_U_BOOT_SIZE		0x60000 /* 384 KBytes */
@@ -200,7 +197,7 @@
 #define CFG_BOOT_SIZE		0x6000 /* 24 KBytes */
 #define CFG_U_BOOT_BASE		(PHYS_FLASH_1 + 0x10000)
 #define CFG_U_BOOT_SIZE		0x10000 /* 64 KBytes */
-#endif
+#endif	/* CONFIG_INIT_CRITICAL */
 
 #define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 34efc384b91..5a0f460e68b 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -29,7 +29,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /* ARM asynchronous clock */
 #define AT91C_MAIN_CLOCK	207360000	/* from 18.432 MHz crystal (18432000 / 4 * 45) */
@@ -44,15 +44,7 @@
 #define CONFIG_SETUP_MEMORY_TAGS 1
 #define CONFIG_INITRD_TAG	1
 
-/* define this to include the functionality of boot.bin in u-boot */
-#define CONFIG_BOOTBINFUNC
-
-/* just to make sure */
-#ifndef CONFIG_BOOTBINFUNC
-#define CONFIG_BOOTBINFUNC
-#endif
-
-#ifdef CONFIG_BOOTBINFUNC
+#ifdef CONFIG_INIT_CRITICAL
 #define CFG_USE_MAIN_OSCILLATOR		1
 /* flash */
 #define MC_PUIA_VAL	0x00000000
@@ -82,7 +74,7 @@
 #define SDRC_MR_VAL2	0x00000003 /* Load Mode Register */
 #define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
-#endif
+#endif	/* CONFIG_INIT_CRITICAL */
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index 2cec4c7c513..ca7a97b5628 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -32,7 +32,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
@@ -306,7 +306,7 @@
 #else
 #define CFG_MDCNFG_VAL      0x00001aa1  /* FIXME can DTC be 01?     */
 #define CFG_MDMRS_VAL       0x00000000
-#define CFG_MDREFR_VAL      0x00403018  /* Initial setting, individual bits set in memsetup.S */
+#define CFG_MDREFR_VAL      0x00403018  /* Initial setting, individual bits set in lowlevel_init.S */
 #endif
 
 /*
diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 1b39d23c884..0b2b251baeb 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -37,7 +37,7 @@
  * If we are developing, we might want to start U-Boot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
-#define CONFIG_INIT_CRITICAL		/* undef for developing */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index f3a871bda3f..b14e35b6288 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -31,8 +31,7 @@
  * 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 */
-#undef CONFIG_INIT_CRITICAL		/* undef for developing */
+#undef CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index d9dd620c1ca..41ad3943e1c 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -31,7 +31,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 24b1779b4cd..9e0ed51fa48 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -33,7 +33,7 @@
  * Also swap the flash1 and flash2 addresses during debug.
  *
  */
-#define CONFIG_INIT_CRITICAL		/* undef for developing */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 618b25ae2df..dbb8dec85dc 100644
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -38,7 +38,7 @@
  * e.g. bootp/tftp download of the kernel is a far more convenient
  * when testing new kernels on this target. However the ADS GCPlus Linux
  * boot ROM leaves the MMU enabled when it passes control to U-Boot. So
- * we use memsetup (CONFIG_INIT_CRITICAL) to remedy that problem.
+ * we use lowlevel_init (CONFIG_INIT_CRITICAL) to remedy that problem.
  */
 #define CONFIG_INIT_CRITICAL
 
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index b4c1edfa3dc..dbc951de65e 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -31,7 +31,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index f8845192218..a3d36a0d8f0 100644
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -34,7 +34,7 @@
  * If we are developing, we might want to start U-Boot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
-#define CONFIG_INIT_CRITICAL		/* undef for developing */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 1add778e5fe..a8067f6ef2a 100644
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -41,7 +41,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 #undef CONFIG_USE_IRQ                   /* we don't need IRQ/FIQ stuff */
 
diff --git a/include/configs/lart.h b/include/configs/lart.h
index c98f3777ca2..3c9895ab27e 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -31,7 +31,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index 2aee461fdd8..b320a4050df 100644
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -34,7 +34,7 @@
  * If we are developing, we might want to start U-Boot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
-#define CONFIG_INIT_CRITICAL		/* undef for developing */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index 808fe1c7b09..6f2c32c5469 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -27,7 +27,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 #undef CONFIG_USE_IRQ
 
diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index de465ea368c..e6855fb1ef3 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -27,7 +27,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 #undef CONFIG_USE_IRQ
 
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index efe205de4ca..536a175bd65 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -34,7 +34,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index fd1b47c4fc4..166aa1180cf 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -31,7 +31,7 @@
  * If we are developing, we might want to start u-boot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
-#define CONFIG_INIT_CRITICAL            /* undef for developing */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 3f1419e5ab5..f7ccea3d45e 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -32,7 +32,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index 11d21b20d19..af39e2e88d4 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -31,7 +31,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 88d6c462b43..552beedc5cf 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -30,7 +30,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index beff6d89d71..9b822152c24 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -30,7 +30,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index d0608ddef94..c00976efd14 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -30,7 +30,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index 43be807f6a5..cd2dbf18b82 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -30,8 +30,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index ace380fe2f0..1bdea6c5ab7 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -32,7 +32,7 @@
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
 
-#define CONFIG_INIT_CRITICAL		     /* undef for developing */
+#define CONFIG_INIT_CRITICAL
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index f7338034b74..9ba19c85068 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -34,7 +34,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
@@ -208,8 +208,8 @@
 #define CFG_MDCNFG_VAL		0x00000aC9 /* Memory timings for the SDRAM.
 					      tRP=2, CL=2, tRCD=2, tRAS=5, tRC=8 */
 
-#define CFG_MDREFR_VAL		0x00403018 /* Initial setting, individual
-					      bits set in memsetup.S	  */
+#define CFG_MDREFR_VAL		0x00403018 /* Initial setting, individual	*/
+					   /* bits set in lowlevel_init.S	*/
 #define CFG_MDMRS_VAL		0x00000000
 
 /*
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 7afe62d7cc1..8a4e3709b14 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -37,7 +37,7 @@
  * bring us to live
  */
 #define CONFIG_INFERNO			/* we are using the inferno bootldr */
-#undef CONFIG_INIT_CRITICAL		/* undef for developing */
+#undef CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index b95b8c073c8..f477575be8d 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -34,7 +34,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 7e3a02d29ba..2a1cd7707a5 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -33,7 +33,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index e8c437364fc..6fda7b96fd5 100644
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -29,7 +29,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 137d9346773..2f592605644 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -40,7 +40,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index a8a8ee535cd..ca32efb3c45 100644
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -27,7 +27,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 #define CONFIG_PXA250          1        /* this is an PXA250 CPU     */
 #define CONFIG_WEPEP250        1        /* config for wepep250 board */
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index fc3739f41d5..1177003c801 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -40,7 +40,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
 #undef CONFIG_INIT_CRITICAL
diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index 10f69d998e0..1be7dd46a7d 100644
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -32,7 +32,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /*
  * High Level Configuration Options
@@ -330,7 +330,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)
diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 87d2c942d76..6b15766daa2 100644
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -32,7 +32,7 @@
  * 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 */
+#define CONFIG_INIT_CRITICAL
 
 /* High Level Configuration Options */
 #define CONFIG_PXA250			1		/* This is an PXA250 CPU    */