Prepare for SoC rework of ARM code:

- rename CONFIG_BOOTBINFUNC into CONFIG_INIT_CRITICAL - rename memsetup into lowlevel_init (function name and source files)
19 years ago · 400558b561
parent 414eec35e3
commit 400558b561
115 changed files with 208 additions and 210 deletions
--- a/4
+++ b/4
@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 * Prepare for SoC rework of ARM code:
  - rename CONFIG_BOOTBINFUNC into  CONFIG_INIT_CRITICAL
  - rename memsetup into lowlevel_init (function name and source files)
 * Fix problems with SNTP support;
  enable SNTP support in some boards.
--- a/9
+++ b/9
@ -2128,6 +2128,15 @@ Low Level (hardware related) configuration options:
 		This only takes effect if the memory commands are activated
 		globally (CFG_CMD_MEM).
 - CONFIG_INIT_CRITICAL
                [ARM only] If this variable is NOT defined, then
                certain critical initializations (like setting up the
                memory controller) are omitted. Normally this
                variable MUST be defined for all boards. The only
                exception is when U-Boot is loaded (to RAM) by some
                other boot loader or by a debugger which performs
                these intializations itself.
 Building the Software:
 ======================
--- a/board/assabet/setup.S
+++ b/board/assabet/setup.S
@ -80,8 +80,8 @@ BCR_DB1110:	.long	ASSABET_BCR_DB1110
 LEDS:		.long	NEPONSET_LEDS
-	.globl memsetup
+	.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* Setting up the memory and stuff */
--- a/board/cerf250/Makefile
+++ b/board/cerf250/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= cerf250.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/cerf250/lowlevel_init.S
+++ b/board/cerf250/lowlevel_init.S
@ -3,7 +3,7 @@
 *
 * NOTE: I haven't clean this up considerably, just enough to get it
 * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
 * much cleaner.
 *
 * See file CREDITS for list of people who contributed to this
@ -43,8 +43,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
 * 	Memory setup
 */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* Set up GPIO pins first ----------------------------------------- */
@ -403,9 +403,9 @@ initclks:
 #endif
 	/* ---------------------------------------------------------------- */
-	/* End memsetup                                                     */
+	/* End lowlevel_init                                                     */
 	/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
    mov     pc,	lr
--- a/board/cradle/Makefile
+++ b/board/cradle/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= cradle.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/cradle/lowlevel_init.S
+++ b/board/cradle/lowlevel_init.S
@ -43,8 +43,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
   .endm
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
    mov      r10, lr
@ -512,4 +512,4 @@ mem_init:
   mov   pc, r10
-@ End memsetup
+@ End lowlevel_init
--- a/board/csb226/Makefile
+++ b/board/csb226/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= csb226.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/csb226/lowlevel_init.S
+++ b/board/csb226/lowlevel_init.S
@ -3,7 +3,7 @@
 *
 * NOTE: I haven't clean this up considerably, just enough to get it
 * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
 * much cleaner.
 *
 * See file CREDITS for list of people who contributed to this
@ -46,8 +46,8 @@ _TEXT_BASE:
 * 	Memory setup
 */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
    mov      r10, lr
@ -429,9 +429,9 @@ initclks:
 #endif
 	/* ---------------------------------------------------------------- */
-	/* End memsetup                                                     */
+	/* End lowlevel_init                                                     */
 	/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
    mov     pc, lr
--- a/board/dave/B2/Makefile
+++ b/board/dave/B2/Makefile
@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= B2.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/dave/B2/lowlevel_init.S
+++ b/board/dave/B2/lowlevel_init.S
@ -149,8 +149,8 @@ MEMORY_CONFIG:
  .word 0x20      /*MRSR7*/
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/*
 		the next instruction fail due memory relocation...
--- a/board/dbau1x00/Makefile
+++ b/board/dbau1x00/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	= $(BOARD).o flash.o
-SOBJS	= memsetup.o
+SOBJS	= lowlevel_init.o
 $(LIB):	.depend $(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/dbau1x00/lowlevel_init.S
+++ b/board/dbau1x00/lowlevel_init.S
@ -16,8 +16,8 @@
 	.set noreorder
 	.set mips32
-	.globl	memsetup
+	.globl	lowlevel_init
-memsetup:
+lowlevel_init:
 	/*
 	 * Step 1) Establish CPU endian mode.
 	 * Db1500-specific:
--- a/board/dnp1110/Makefile
+++ b/board/dnp1110/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= dnp1110.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/dnp1110/lowlevel_init.S
+++ b/board/dnp1110/lowlevel_init.S
@ -63,8 +63,8 @@ smcnfg:		.long	0x00000000
 /* setting up the memory */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	ldr	r0, MEM_BASE
--- a/board/ep7312/Makefile
+++ b/board/ep7312/Makefile
@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= ep7312.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/ep7312/lowlevel_init.S
+++ b/board/ep7312/lowlevel_init.S
@ -45,8 +45,8 @@ sdrfpr_val:	.long	0x00000240
 sdconf_val:	.long	0x00000522
 /* setting up the memory */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/*
 	 * SYSCON1-3
 	 */
--- a/board/evb4510/Makefile
+++ b/board/evb4510/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= evb4510.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $^
--- a/board/evb4510/lowlevel_init.S
+++ b/board/evb4510/lowlevel_init.S
@ -31,7 +31,7 @@
 *
 * This memory map allows us to relocate from FLASH to SRAM.  After
 * power-on reset the CPU only knows about the FLASH memory at address
- * 0x00000000.	After memsetup completes the memory map will be:
+ * 0x00000000.	After lowlevel_init completes the memory map will be:
 *
 * Memory Addr
 * 0x00000000
@ -54,8 +54,8 @@
 *
 ***********************************************************************/
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* preserve the temp register (r12 AKA ip) and remap it. */
 	ldr r1, =SRAM_BASE+0xC
--- a/board/gcplus/Makefile
+++ b/board/gcplus/Makefile
@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= gcplus.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/gcplus/lowlevel_init.S
+++ b/board/gcplus/lowlevel_init.S
@ -29,11 +29,11 @@
 #include "version.h"
-	.globl	memsetup
+	.globl	lowlevel_init
-memsetup:
+lowlevel_init:
 	/* The ADS GC+ for Linux Boot Rom Ver. 1.73 does memory init for us.
 	 * However the darn thing leaves the MMU enabled before handing control
-	 * over to us. So we need to disable the MMU and we use memsetup
+	 * over to us. So we need to disable the MMU and we use lowlevel_init
 	 * to do it.
 	 */
--- a/board/impa7/Makefile
+++ b/board/impa7/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= impa7.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/impa7/lowlevel_init.S
+++ b/board/impa7/lowlevel_init.S
@ -39,8 +39,8 @@ memcfg2_val:	.long	0x00000000 @ upper 16 bits are reserved for CS7 + CS6
 drfpr_val:	.long	0x00000081
 /* setting up the memory */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/*
 	 * DRFPR
 	 * 64kHz DRAM refresh
--- a/board/incaip/Makefile
+++ b/board/incaip/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	= $(BOARD).o flash.o
-SOBJS	= memsetup.o
+SOBJS	= lowlevel_init.o
 $(LIB):	.depend $(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/incaip/lowlevel_init.S
+++ b/board/incaip/lowlevel_init.S
@ -269,9 +269,9 @@ sdram_init:
 	.end	sdram_init
-	.globl	memsetup
+	.globl	lowlevel_init
-	.ent	memsetup
+	.ent	lowlevel_init
-memsetup:
+lowlevel_init:
 	/* EBU, CGU and SDRAM Initialization.
 	 */
@ -292,4 +292,4 @@ memsetup:
 	j	ra
 	nop
-	.end	memsetup
+	.end	lowlevel_init
--- a/board/innokom/Makefile
+++ b/board/innokom/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= innokom.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/innokom/lowlevel_init.S
+++ b/board/innokom/lowlevel_init.S
@ -3,7 +3,7 @@
 *
 * NOTE: I haven't clean this up considerably, just enough to get it
 * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
 * much cleaner.
 *
 * See file CREDITS for list of people who contributed to this
@ -46,8 +46,8 @@ _TEXT_BASE:
 * 	Memory setup
 */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
    mov      r10, lr
@ -429,9 +429,9 @@ initclks:
 #endif
 	/* ---------------------------------------------------------------- */
-	/* End memsetup                                                     */
+	/* End lowlevel_init                                                     */
 	/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
    mov     pc, lr
--- a/board/lart/Makefile
+++ b/board/lart/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= lart.o flash.o
-SOBJS	:= flashasm.o memsetup.o
+SOBJS	:= flashasm.o lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/lart/lowlevel_init.S
+++ b/board/lart/lowlevel_init.S
@ -53,8 +53,8 @@ mecr:		.long	0x00060006
 /* setting up the memory */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	ldr	r0, MEM_BASE
 	/* Setup the flash memory */
--- a/board/logodl/Makefile
+++ b/board/logodl/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= logodl.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $^
--- a/board/logodl/lowlevel_init.S
+++ b/board/logodl/lowlevel_init.S
@ -3,7 +3,7 @@
 *
 * NOTE: I haven't clean this up considerably, just enough to get it
 * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
 * much cleaner.
 *
 * See file CREDITS for list of people who contributed to this
@ -46,8 +46,8 @@ _TEXT_BASE:
 * 	Memory setup
 */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
    mov      r10, lr
@ -429,9 +429,9 @@ initclks:
 #endif
 	/* ---------------------------------------------------------------- */
-	/* End memsetup                                                     */
+	/* End lowlevel_init                                                     */
 	/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
    mov     pc, lr
--- a/board/lpd7a40x/Makefile
+++ b/board/lpd7a40x/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= lpd7a40x.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/lpd7a40x/lowlevel_init.S
+++ b/board/lpd7a40x/lowlevel_init.S
@ -131,8 +131,8 @@
 _TEXT_BASE:
 	.word	TEXT_BASE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	r9, lr	@ save return address
 	/* memory control configuration */
--- a/board/lubbock/Makefile
+++ b/board/lubbock/Makefile
@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= lubbock.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/lubbock/lowlevel_init.S
+++ b/board/lubbock/lowlevel_init.S
@ -3,7 +3,7 @@
 *
 * NOTE: I haven't clean this up considerably, just enough to get it
 * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
 * much cleaner.
 *
 * See file CREDITS for list of people who contributed to this
@ -43,8 +43,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
 * 	Memory setup
 */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
    mov      r10, lr
@ -403,9 +403,9 @@ initclks:
 #endif
 	/* ---------------------------------------------------------------- */
-	/* End memsetup                                                     */
+	/* End lowlevel_init                                                     */
 	/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
    mov     pc, lr
--- a/board/modnet50/Makefile
+++ b/board/modnet50/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= modnet50.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $^
--- a/board/modnet50/lowlevel_init.S
+++ b/board/modnet50/lowlevel_init.S
@ -51,8 +51,8 @@
 #define NETARM_MMAP_CS4_MASK	(~(PHYS_EXT_SIZE - 1))
 /* setting up the memory */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 #if defined(CONFIG_MODNET50)
 	ldr	pc, =(_jump_to_high + NETARM_MMAP_CS0_BASE - TEXT_BASE)
@ -187,7 +187,7 @@ memsetup_cs3:
 #endif /* CONFIG_MODNET50 */
-memsetup_end:
+lowlevel_init_end:
 	/*
 	 * manipulate address in lr and ip to match new
 	 * address space
--- a/board/mpl/vcma9/Makefile
+++ b/board/mpl/vcma9/Makefile
@ -28,7 +28,7 @@ LIB	= lib$(BOARD).a
 OBJS	:= vcma9.o flash.o cmd_vcma9.o
 OBJS	+= ../common/common_util.o ../common/memtst.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/mpl/vcma9/lowlevel_init.S
+++ b/board/mpl/vcma9/lowlevel_init.S
@ -130,8 +130,8 @@
 _TEXT_BASE:
 	.word	TEXT_BASE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* memory control configuration */
 	/* make r0 relative the current location so that it */
 	/* reads SMRDATA out of FLASH rather than memory ! */
--- a/board/mx1ads/Makefile
+++ b/board/mx1ads/Makefile
@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= mx1ads.o syncflash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/mx1ads/lowlevel_init.S
+++ b/board/mx1ads/lowlevel_init.S
@ -1,5 +1,5 @@
 /*
- * board/mx1ads/memsetup.S
+ * board/mx1ads/lowlevel_init.S
 *
 * (c) Copyright 2004
 * Techware Information Technology, Inc.
@ -33,8 +33,8 @@
 _TEXT_BASE:
 	.word	TEXT_BASE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 /* memory controller init	 	*/
 	ldr  r1, =SDCTL0
--- a/board/mx1fs2/Makefile
+++ b/board/mx1fs2/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= mx1fs2.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $^
--- a/board/mx1fs2/lowlevel_init.S
+++ b/board/mx1fs2/lowlevel_init.S
@ -22,8 +22,8 @@
 #include <version.h>
 #include <asm/arch/imx-regs.h>
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	r10, lr
--- a/board/pleb2/Makefile
+++ b/board/pleb2/Makefile
@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= pleb2.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/pleb2/lowlevel_init.S
+++ b/board/pleb2/lowlevel_init.S
@ -33,8 +33,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
 	sub	pc,pc,#4
 	.endm
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	r10, lr
@ -485,4 +485,4 @@ mem_init:
 	mov	pc, r10
-@ End memsetup
+@ End lowlevel_init
--- a/board/purple/Makefile
+++ b/board/purple/Makefile
@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	= $(BOARD).o flash.o sconsole.o
-SOBJS	= memsetup.o
+SOBJS	= lowlevel_init.o
 $(LIB):	.depend $(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS)
--- a/board/purple/lowlevel_init.S
+++ b/board/purple/lowlevel_init.S
@ -28,8 +28,8 @@
 #define MC_IOGP	0xBF800800
-	.globl	memsetup
+	.globl	lowlevel_init
-memsetup:
+lowlevel_init:
 	li	t0, MC_IOGP
 	li	t1, 0xf24
 	sw	t1, 0(t0)
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@ -35,7 +35,7 @@ SECTIONS
 	.text       :
 	{
 	  cpu/mips/start.o		(.text)
-	  board/purple/memsetup.o	(.text)
+	  board/purple/lowlevel_init.o	(.text)
 	  cpu/mips/cache.o		(.text)
 	  common/main.o			(.text)
 	  common/dlmalloc.o		(.text)
--- a/board/scb9328/Makefile
+++ b/board/scb9328/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= scb9328.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $^
--- a/board/scb9328/lowlevel_init.S
+++ b/board/scb9328/lowlevel_init.S
@ -22,8 +22,8 @@
 #include <version.h>
 #include <asm/arch/imx-regs.h>
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	r10, lr
--- a/board/shannon/Makefile
+++ b/board/shannon/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= shannon.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/shannon/lowlevel_init.S
+++ b/board/shannon/lowlevel_init.S
@ -51,8 +51,8 @@ mecr:		.long	0x7fff7fff @ 01000000
 /* setting up the memory */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	ldr	r0, MEM_BASE
 	/* Setup the flash memory */
--- a/board/smdk2400/Makefile
+++ b/board/smdk2400/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= smdk2400.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/smdk2400/lowlevel_init.S
+++ b/board/smdk2400/lowlevel_init.S
@ -125,8 +125,8 @@
 _TEXT_BASE:
 	.word	TEXT_BASE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* memory control configuration */
 	/* make r0 relative the current location so that it */
 	/* reads SMRDATA out of FLASH rather than memory ! */
--- a/board/smdk2410/Makefile
+++ b/board/smdk2410/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= smdk2410.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/smdk2410/lowlevel_init.S
+++ b/board/smdk2410/lowlevel_init.S
@ -129,8 +129,8 @@
 _TEXT_BASE:
 	.word	TEXT_BASE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* memory control configuration */
 	/* make r0 relative the current location so that it */
 	/* reads SMRDATA out of FLASH rather than memory ! */
--- a/board/tb0229/Makefile
+++ b/board/tb0229/Makefile
@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	= $(BOARD).o flash.o vr4131-pci.o
-SOBJS	= memsetup.o
+SOBJS	= lowlevel_init.o
 $(LIB):	.depend $(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/tb0229/lowlevel_init.S
+++ b/board/tb0229/lowlevel_init.S
@ -14,8 +14,8 @@
 #include <asm/regdef.h>
-	.globl  memsetup
+	.globl  lowlevel_init
-memsetup:
+lowlevel_init:
 	/* BCUCNTREG1 = 0x0040 */
 	la	t0, 0xaf000000
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= trab.o flash.o vfd.o cmd_trab.o memory.o tsc2000.o auto_update.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
--- a/board/trab/lowlevel_init.S
+++ b/board/trab/lowlevel_init.S
@ -140,8 +140,8 @@
 _TEXT_BASE:
 	.word	TEXT_BASE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	/* memory control configuration */
 	/* make r0 relative the current location so that it */
 	/* reads SMRDATA out of FLASH rather than memory ! */
--- a/board/wepep250/Makefile
+++ b/board/wepep250/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= wepep250.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/wepep250/lowlevel_init.S
+++ b/board/wepep250/lowlevel_init.S
@ -35,8 +35,8 @@
 #include <version.h>
 #include <asm/arch/pxa-regs.h>
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	r10, lr
--- a/board/xaeniax/Makefile
+++ b/board/xaeniax/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= xaeniax.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/xaeniax/lowlevel_init.S
+++ b/board/xaeniax/lowlevel_init.S
@ -3,7 +3,7 @@
 *
 * NOTE: I haven't clean this up considerably, just enough to get it
 * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
 * much cleaner.
 *
 * See file CREDITS for list of people who contributed to this
@ -39,8 +39,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
 	.endm
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	 r10, lr
@ -416,9 +416,9 @@ test:
 #endif
 	/* ---------------------------------------------------------------- */
-	/* End memsetup                                                     */
+	/* End lowlevel_init                                                     */
 	/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
 	mov     pc, lr
--- a/board/xm250/Makefile
+++ b/board/xm250/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= xm250.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $^
--- a/board/xm250/lowlevel_init.S
+++ b/board/xm250/lowlevel_init.S
@ -43,8 +43,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
 	.endm
 */
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
 	mov	r10, lr
@ -516,4 +516,4 @@ mem_init:
 	mov	pc, r10
-@ End memsetup
+@ End lowlevel_init
--- a/board/xsengine/Makefile
+++ b/board/xsengine/Makefile
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 OBJS	:= xsengine.o flash.o
-SOBJS	:= memsetup.o
+SOBJS	:= lowlevel_init.o
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
--- a/board/xsengine/lowlevel_init.S
+++ b/board/xsengine/lowlevel_init.S
@ -4,8 +4,8 @@
 DRAM_SIZE:  .long   CFG_DRAM_SIZE
-.globl memsetup
+.globl lowlevel_init
-memsetup:
+lowlevel_init:
   mov      r10, lr
--- a/cpu/arm720t/start.S
+++ b/cpu/arm720t/start.S
@ -316,10 +316,10 @@ cpu_init_crit:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependent, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
 	mov	ip, lr
-	bl	memsetup
+	bl	lowlevel_init
 	mov	lr, ip
 	mov	pc, lr
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@ -257,10 +257,10 @@ cpu_init_crit:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependend, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
 	mov	ip, lr
-	bl	memsetup
+	bl	lowlevel_init
 	mov	lr, ip
 	mov	pc, lr
--- a/cpu/at91rm9200/lowlevel.S
+++ b/cpu/at91rm9200/lowlevel.S
@ -30,7 +30,7 @@
 #include <config.h>
 #include <version.h>
-#ifdef CONFIG_BOOTBINFUNC
+#ifdef CONFIG_INIT_CRITICAL
 /*
 * some parameters for the board
 *
@ -197,4 +197,4 @@ SMRDATA1:
 	.word SDRAM
 	.word SDRAM_VAL
 	/* SMRDATA1 is 176 bytes long */
-#endif /* CONFIG_BOOTBINFUNC */
+#endif /* CONFIG_INIT_CRITICAL */
--- a/cpu/at91rm9200/start.S
+++ b/cpu/at91rm9200/start.S
@ -115,7 +115,7 @@ reset:
 	orr     r0,r0,#0xd3 /* was 13 */
 	msr     cpsr,r0
-#ifdef CONFIG_BOOTBINFUNC
+#ifdef CONFIG_INIT_CRITICAL
 	/* scratch stack */
 	ldr 	r1, =0x00204000
 	/* Insure word alignment */
@ -141,7 +141,7 @@ reset:
 	orr	r0, r0, #0x00001000	@ set bit 12 (I) I-Cache
 	orr	r0, r0, #0xC0000000	@ set bits 31:30 (iA, nF)
 	mcr     p15, 0, r0, c1, c0, 0	@ write r0 in cp15 control register (cp15 r1)
-#endif /* CONFIG_BOOTBINFUNC */
+#endif /* CONFIG_INIT_CRITICAL */
 	/*
 	 * relocate exeception table
 	 */
@ -160,9 +160,7 @@ copyex:
 	 */
 #ifdef CONFIG_INIT_CRITICAL
 	bl      cpu_init_crit
 #endif
 #ifdef CONFIG_BOOTBINFUNC
 relocate:				/* relocate U-Boot to RAM	    */
 	adr	r0, _start		/* r0 <- current position of code   */
 	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
@ -179,7 +177,7 @@ copy_loop:
 	stmia	r1!, {r3-r10}		/* copy to   target address [r1]    */
 	cmp	r0, r2			/* until source end addreee [r2]    */
 	ble	copy_loop
-#endif /* CONFIG_BOOTBINFUNC */
+#endif /* CONFIG_INIT_CRITICAL */
 	/* Set up the stack						    */
 stack_setup:
--- a/cpu/lh7a40x/start.S
+++ b/cpu/lh7a40x/start.S
@ -229,10 +229,10 @@ cpu_init_crit:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependend, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
 	mov	ip, lr
-	bl	memsetup
+	bl	lowlevel_init
 	mov	lr, ip
 	mov	pc, lr
--- a/cpu/mips/start.S
+++ b/cpu/mips/start.S
@ -243,7 +243,7 @@ reset:
 	/* Initialize any external memory.
 	 */
-	bal	memsetup
+	bal	lowlevel_init
 	nop
 	/* Initialize caches...
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@ -218,10 +218,10 @@ setspeed_done:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependend, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
 	mov	ip,	lr
-	bl	memsetup
+	bl	lowlevel_init
 	mov	lr,	ip
 	/* Memory interfaces are working. Disable MMU and enable I-cache.   */
--- a/cpu/s3c44b0/start.S
+++ b/cpu/s3c44b0/start.S
@ -117,9 +117,9 @@ reset:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependend, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
-	bl	memsetup
+	bl	lowlevel_init
 #endif
 relocate:				/* relocate U-Boot to RAM	    */
--- a/cpu/sa1100/start.S
+++ b/cpu/sa1100/start.S
@ -213,10 +213,10 @@ cpu_init_crit:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependend, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
 	mov	ip,	lr
-	bl	memsetup
+	bl	lowlevel_init
 	mov	lr,	ip
 	/*
--- a/doc/README.modnet50
+++ b/doc/README.modnet50
@ -47,7 +47,7 @@ Files:
 cpu/arm720t/serial_netarm.c .. serial I/O for the cpu
-board/modnet50/memsetup.S   .. memory setup for ModNET50
+board/modnet50/lowlevel_init.S   .. memory setup for ModNET50
 board/modnet50/flash.c	    .. flash routines
 board/modnet50/modnet50.c   .. some board init stuff
--- 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
--- 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
--- 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
--- 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 */
+#ifdef CONFIG_INIT_CRITICAL
 #undef CONFIG_BOOTBINFUNC
 #ifdef CONFIG_BOOTBINFUNC
 #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	/* CONFIG_INIT_CRITICAL */
-#endif
+#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 }
--- 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 */
+#ifdef CONFIG_INIT_CRITICAL
 #define CONFIG_BOOTBINFUNC
 /* just to make sure */
 #ifndef CONFIG_BOOTBINFUNC
 #define CONFIG_BOOTBINFUNC
 #endif
 #ifdef CONFIG_BOOTBINFUNC
 #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
--- 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
 /*
--- 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
--- 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 CONFIG_INIT_CRITICAL		/* undef for developing */
 /*
 * High Level Configuration Options
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More