Prepare for SoC rework of ARM code:
- rename CONFIG_BOOTBINFUNC into CONFIG_INIT_CRITICAL
- rename memsetup into lowlevel_init (function name and source files)
diff --git a/CHANGELOG b/CHANGELOG
index 5ccee97..1136f11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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.
diff --git a/README b/README
index a9c052c..6cc7405 100644
--- a/README
+++ b/README
@@ -2128,6 +2128,15 @@
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:
======================
diff --git a/board/assabet/setup.S b/board/assabet/setup.S
index fefb431..56ea0dd 100644
--- a/board/assabet/setup.S
+++ b/board/assabet/setup.S
@@ -80,8 +80,8 @@
LEDS: .long NEPONSET_LEDS
- .globl memsetup
-memsetup:
+ .globl lowlevel_init
+lowlevel_init:
/* Setting up the memory and stuff */
diff --git a/board/cerf250/Makefile b/board/cerf250/Makefile
index 3ab97df..83e3ba4 100644
--- a/board/cerf250/Makefile
+++ b/board/cerf250/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := cerf250.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/cerf250/memsetup.S b/board/cerf250/lowlevel_init.S
similarity index 97%
rename from board/cerf250/memsetup.S
rename to board/cerf250/lowlevel_init.S
index f3d373a..c9b68d7 100644
--- a/board/cerf250/memsetup.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 @@
* Memory setup
*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* Set up GPIO pins first ----------------------------------------- */
@@ -403,9 +403,9 @@
#endif
/* ---------------------------------------------------------------- */
- /* End memsetup */
+ /* End lowlevel_init */
/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
mov pc, lr
diff --git a/board/cradle/Makefile b/board/cradle/Makefile
index 5a321eb..265d500 100644
--- a/board/cradle/Makefile
+++ b/board/cradle/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := cradle.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/cradle/memsetup.S b/board/cradle/lowlevel_init.S
similarity index 99%
rename from board/cradle/memsetup.S
rename to board/cradle/lowlevel_init.S
index 8800cb0..2fd307f 100644
--- a/board/cradle/memsetup.S
+++ b/board/cradle/lowlevel_init.S
@@ -43,8 +43,8 @@
.endm
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -512,4 +512,4 @@
mov pc, r10
-@ End memsetup
+@ End lowlevel_init
diff --git a/board/csb226/Makefile b/board/csb226/Makefile
index ac94642..5b311a9 100644
--- a/board/csb226/Makefile
+++ b/board/csb226/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := csb226.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/csb226/memsetup.S b/board/csb226/lowlevel_init.S
similarity index 98%
rename from board/csb226/memsetup.S
rename to board/csb226/lowlevel_init.S
index 68577ca..aa9dcba 100644
--- a/board/csb226/memsetup.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 @@
* Memory setup
*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -429,9 +429,9 @@
#endif
/* ---------------------------------------------------------------- */
- /* End memsetup */
+ /* End lowlevel_init */
/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
mov pc, lr
diff --git a/board/dave/B2/Makefile b/board/dave/B2/Makefile
index c0c3f67..548fd52 100644
--- a/board/dave/B2/Makefile
+++ b/board/dave/B2/Makefile
@@ -27,7 +27,7 @@
LIB = lib$(BOARD).a
OBJS := B2.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/dave/B2/memsetup.S b/board/dave/B2/lowlevel_init.S
similarity index 98%
rename from board/dave/B2/memsetup.S
rename to board/dave/B2/lowlevel_init.S
index 3f64cb3..2f3a364 100644
--- a/board/dave/B2/memsetup.S
+++ b/board/dave/B2/lowlevel_init.S
@@ -149,8 +149,8 @@
.word 0x20 /*MRSR7*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/*
the next instruction fail due memory relocation...
diff --git a/board/dbau1x00/Makefile b/board/dbau1x00/Makefile
index d1cdc6b..d9b0e2d 100644
--- a/board/dbau1x00/Makefile
+++ b/board/dbau1x00/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS = $(BOARD).o flash.o
-SOBJS = memsetup.o
+SOBJS = lowlevel_init.o
$(LIB): .depend $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/dbau1x00/memsetup.S b/board/dbau1x00/lowlevel_init.S
similarity index 99%
rename from board/dbau1x00/memsetup.S
rename to board/dbau1x00/lowlevel_init.S
index c96d8a5..7afd584 100644
--- a/board/dbau1x00/memsetup.S
+++ b/board/dbau1x00/lowlevel_init.S
@@ -16,8 +16,8 @@
.set noreorder
.set mips32
- .globl memsetup
-memsetup:
+ .globl lowlevel_init
+lowlevel_init:
/*
* Step 1) Establish CPU endian mode.
* Db1500-specific:
diff --git a/board/dnp1110/Makefile b/board/dnp1110/Makefile
index 31ef695..eaa38bc 100644
--- a/board/dnp1110/Makefile
+++ b/board/dnp1110/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := dnp1110.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/dnp1110/memsetup.S b/board/dnp1110/lowlevel_init.S
similarity index 98%
rename from board/dnp1110/memsetup.S
rename to board/dnp1110/lowlevel_init.S
index 1622aea..7730be3 100644
--- a/board/dnp1110/memsetup.S
+++ b/board/dnp1110/lowlevel_init.S
@@ -63,8 +63,8 @@
/* setting up the memory */
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
ldr r0, MEM_BASE
diff --git a/board/ep7312/Makefile b/board/ep7312/Makefile
index 2b4c975..c53a3c7 100644
--- a/board/ep7312/Makefile
+++ b/board/ep7312/Makefile
@@ -27,7 +27,7 @@
LIB = lib$(BOARD).a
OBJS := ep7312.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/ep7312/memsetup.S b/board/ep7312/lowlevel_init.S
similarity index 97%
rename from board/ep7312/memsetup.S
rename to board/ep7312/lowlevel_init.S
index 6078937..5dadb31 100644
--- a/board/ep7312/memsetup.S
+++ b/board/ep7312/lowlevel_init.S
@@ -45,8 +45,8 @@
sdconf_val: .long 0x00000522
/* setting up the memory */
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/*
* SYSCON1-3
*/
diff --git a/board/evb4510/Makefile b/board/evb4510/Makefile
index 1ab4dfb..10850a9 100644
--- a/board/evb4510/Makefile
+++ b/board/evb4510/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := evb4510.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $^
diff --git a/board/evb4510/memsetup.S b/board/evb4510/lowlevel_init.S
similarity index 97%
rename from board/evb4510/memsetup.S
rename to board/evb4510/lowlevel_init.S
index 915af1e..7184d72 100644
--- a/board/evb4510/memsetup.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
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* preserve the temp register (r12 AKA ip) and remap it. */
ldr r1, =SRAM_BASE+0xC
diff --git a/board/gcplus/Makefile b/board/gcplus/Makefile
index d0f7d1c..1954d66 100644
--- a/board/gcplus/Makefile
+++ b/board/gcplus/Makefile
@@ -28,7 +28,7 @@
LIB = lib$(BOARD).a
OBJS := gcplus.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/gcplus/memsetup.S b/board/gcplus/lowlevel_init.S
similarity index 94%
rename from board/gcplus/memsetup.S
rename to board/gcplus/lowlevel_init.S
index 02f5685..f292c4d 100644
--- a/board/gcplus/memsetup.S
+++ b/board/gcplus/lowlevel_init.S
@@ -29,11 +29,11 @@
#include "version.h"
- .globl memsetup
-memsetup:
+ .globl lowlevel_init
+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.
*/
diff --git a/board/impa7/Makefile b/board/impa7/Makefile
index f8323e0..08543f9 100644
--- a/board/impa7/Makefile
+++ b/board/impa7/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := impa7.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/impa7/memsetup.S b/board/impa7/lowlevel_init.S
similarity index 97%
rename from board/impa7/memsetup.S
rename to board/impa7/lowlevel_init.S
index 5cb5fa8..7ce10a2 100644
--- a/board/impa7/memsetup.S
+++ b/board/impa7/lowlevel_init.S
@@ -39,8 +39,8 @@
drfpr_val: .long 0x00000081
/* setting up the memory */
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/*
* DRFPR
* 64kHz DRAM refresh
diff --git a/board/incaip/Makefile b/board/incaip/Makefile
index d1cdc6b..d9b0e2d 100644
--- a/board/incaip/Makefile
+++ b/board/incaip/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS = $(BOARD).o flash.o
-SOBJS = memsetup.o
+SOBJS = lowlevel_init.o
$(LIB): .depend $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/incaip/memsetup.S b/board/incaip/lowlevel_init.S
similarity index 98%
rename from board/incaip/memsetup.S
rename to board/incaip/lowlevel_init.S
index 3f883c1..fb64ef4 100644
--- a/board/incaip/memsetup.S
+++ b/board/incaip/lowlevel_init.S
@@ -269,9 +269,9 @@
.end sdram_init
- .globl memsetup
- .ent memsetup
-memsetup:
+ .globl lowlevel_init
+ .ent lowlevel_init
+lowlevel_init:
/* EBU, CGU and SDRAM Initialization.
*/
@@ -292,4 +292,4 @@
j ra
nop
- .end memsetup
+ .end lowlevel_init
diff --git a/board/innokom/Makefile b/board/innokom/Makefile
index 59eaee5..73f6a74 100644
--- a/board/innokom/Makefile
+++ b/board/innokom/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := innokom.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/innokom/memsetup.S b/board/innokom/lowlevel_init.S
similarity index 98%
rename from board/innokom/memsetup.S
rename to board/innokom/lowlevel_init.S
index 68577ca..aa9dcba 100644
--- a/board/innokom/memsetup.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 @@
* Memory setup
*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -429,9 +429,9 @@
#endif
/* ---------------------------------------------------------------- */
- /* End memsetup */
+ /* End lowlevel_init */
/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
mov pc, lr
diff --git a/board/lart/Makefile b/board/lart/Makefile
index 42ceb03..550aa1d 100644
--- a/board/lart/Makefile
+++ b/board/lart/Makefile
@@ -26,7 +26,7 @@
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)
diff --git a/board/lart/memsetup.S b/board/lart/lowlevel_init.S
similarity index 97%
rename from board/lart/memsetup.S
rename to board/lart/lowlevel_init.S
index 635f2a0..db9fd63 100644
--- a/board/lart/memsetup.S
+++ b/board/lart/lowlevel_init.S
@@ -53,8 +53,8 @@
/* setting up the memory */
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
ldr r0, MEM_BASE
/* Setup the flash memory */
diff --git a/board/logodl/Makefile b/board/logodl/Makefile
index b635322..c7cde7d 100644
--- a/board/logodl/Makefile
+++ b/board/logodl/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := logodl.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $^
diff --git a/board/logodl/memsetup.S b/board/logodl/lowlevel_init.S
similarity index 98%
rename from board/logodl/memsetup.S
rename to board/logodl/lowlevel_init.S
index 68577ca..aa9dcba 100644
--- a/board/logodl/memsetup.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 @@
* Memory setup
*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -429,9 +429,9 @@
#endif
/* ---------------------------------------------------------------- */
- /* End memsetup */
+ /* End lowlevel_init */
/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
mov pc, lr
diff --git a/board/lpd7a40x/Makefile b/board/lpd7a40x/Makefile
index f0999d1..ebe14df 100644
--- a/board/lpd7a40x/Makefile
+++ b/board/lpd7a40x/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := lpd7a40x.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/lpd7a40x/memsetup.S b/board/lpd7a40x/lowlevel_init.S
similarity index 98%
rename from board/lpd7a40x/memsetup.S
rename to board/lpd7a40x/lowlevel_init.S
index d4e6c6a..b3ed55c 100644
--- a/board/lpd7a40x/memsetup.S
+++ b/board/lpd7a40x/lowlevel_init.S
@@ -131,8 +131,8 @@
_TEXT_BASE:
.word TEXT_BASE
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r9, lr @ save return address
/* memory control configuration */
diff --git a/board/lubbock/Makefile b/board/lubbock/Makefile
index 0e29e7b..106622c 100644
--- a/board/lubbock/Makefile
+++ b/board/lubbock/Makefile
@@ -27,7 +27,7 @@
LIB = lib$(BOARD).a
OBJS := lubbock.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/lubbock/memsetup.S b/board/lubbock/lowlevel_init.S
similarity index 98%
rename from board/lubbock/memsetup.S
rename to board/lubbock/lowlevel_init.S
index dc0b7be..15276e8 100644
--- a/board/lubbock/memsetup.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 @@
* Memory setup
*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -403,9 +403,9 @@
#endif
/* ---------------------------------------------------------------- */
- /* End memsetup */
+ /* End lowlevel_init */
/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
mov pc, lr
diff --git a/board/modnet50/Makefile b/board/modnet50/Makefile
index 7dbcc1c..ab2c376 100644
--- a/board/modnet50/Makefile
+++ b/board/modnet50/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := modnet50.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $^
diff --git a/board/modnet50/memsetup.S b/board/modnet50/lowlevel_init.S
similarity index 98%
rename from board/modnet50/memsetup.S
rename to board/modnet50/lowlevel_init.S
index 674b1d2..c98c155 100644
--- a/board/modnet50/memsetup.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
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
#if defined(CONFIG_MODNET50)
ldr pc, =(_jump_to_high + NETARM_MMAP_CS0_BASE - TEXT_BASE)
@@ -187,7 +187,7 @@
#endif /* CONFIG_MODNET50 */
-memsetup_end:
+lowlevel_init_end:
/*
* manipulate address in lr and ip to match new
* address space
diff --git a/board/mpl/vcma9/Makefile b/board/mpl/vcma9/Makefile
index f9b78f9..304c965 100644
--- a/board/mpl/vcma9/Makefile
+++ b/board/mpl/vcma9/Makefile
@@ -28,7 +28,7 @@
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)
diff --git a/board/mpl/vcma9/memsetup.S b/board/mpl/vcma9/lowlevel_init.S
similarity index 99%
rename from board/mpl/vcma9/memsetup.S
rename to board/mpl/vcma9/lowlevel_init.S
index 98aec3d..a023353 100644
--- a/board/mpl/vcma9/memsetup.S
+++ b/board/mpl/vcma9/lowlevel_init.S
@@ -130,8 +130,8 @@
_TEXT_BASE:
.word TEXT_BASE
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* memory control configuration */
/* make r0 relative the current location so that it */
/* reads SMRDATA out of FLASH rather than memory ! */
diff --git a/board/mx1ads/Makefile b/board/mx1ads/Makefile
index 72f850d..3e805fe 100644
--- a/board/mx1ads/Makefile
+++ b/board/mx1ads/Makefile
@@ -27,7 +27,7 @@
LIB = lib$(BOARD).a
OBJS := mx1ads.o syncflash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/mx1ads/memsetup.S b/board/mx1ads/lowlevel_init.S
similarity index 95%
rename from board/mx1ads/memsetup.S
rename to board/mx1ads/lowlevel_init.S
index 1b06fa3..09c260d 100644
--- a/board/mx1ads/memsetup.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
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* memory controller init */
ldr r1, =SDCTL0
diff --git a/board/mx1fs2/Makefile b/board/mx1fs2/Makefile
index 86aef5c..9e3bca1 100644
--- a/board/mx1fs2/Makefile
+++ b/board/mx1fs2/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := mx1fs2.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $^
diff --git a/board/mx1fs2/memsetup.S b/board/mx1fs2/lowlevel_init.S
similarity index 98%
rename from board/mx1fs2/memsetup.S
rename to board/mx1fs2/lowlevel_init.S
index 5ec751b..8211beb 100644
--- a/board/mx1fs2/memsetup.S
+++ b/board/mx1fs2/lowlevel_init.S
@@ -22,8 +22,8 @@
#include <version.h>
#include <asm/arch/imx-regs.h>
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
diff --git a/board/pleb2/Makefile b/board/pleb2/Makefile
index 5fdc874..95d9170 100644
--- a/board/pleb2/Makefile
+++ b/board/pleb2/Makefile
@@ -27,7 +27,7 @@
LIB = lib$(BOARD).a
OBJS := pleb2.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/pleb2/memsetup.S b/board/pleb2/lowlevel_init.S
similarity index 98%
rename from board/pleb2/memsetup.S
rename to board/pleb2/lowlevel_init.S
index f2e1ce9..add2c53 100644
--- a/board/pleb2/memsetup.S
+++ b/board/pleb2/lowlevel_init.S
@@ -33,8 +33,8 @@
sub pc,pc,#4
.endm
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -485,4 +485,4 @@
mov pc, r10
-@ End memsetup
+@ End lowlevel_init
diff --git a/board/purple/Makefile b/board/purple/Makefile
index a9463b6..b2f2fc0 100644
--- a/board/purple/Makefile
+++ b/board/purple/Makefile
@@ -27,7 +27,7 @@
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)
diff --git a/board/purple/memsetup.S b/board/purple/lowlevel_init.S
similarity index 96%
rename from board/purple/memsetup.S
rename to board/purple/lowlevel_init.S
index d532ceb..668124a 100644
--- a/board/purple/memsetup.S
+++ b/board/purple/lowlevel_init.S
@@ -28,8 +28,8 @@
#define MC_IOGP 0xBF800800
- .globl memsetup
-memsetup:
+ .globl lowlevel_init
+lowlevel_init:
li t0, MC_IOGP
li t1, 0xf24
sw t1, 0(t0)
diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index 6263dd0..aeea5d4 100644
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -35,7 +35,7 @@
.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)
diff --git a/board/scb9328/Makefile b/board/scb9328/Makefile
index 212efcc..5dc3fd4 100644
--- a/board/scb9328/Makefile
+++ b/board/scb9328/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := scb9328.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $^
diff --git a/board/scb9328/memsetup.S b/board/scb9328/lowlevel_init.S
similarity index 98%
rename from board/scb9328/memsetup.S
rename to board/scb9328/lowlevel_init.S
index be5650a..ba3b6d2 100644
--- a/board/scb9328/memsetup.S
+++ b/board/scb9328/lowlevel_init.S
@@ -22,8 +22,8 @@
#include <version.h>
#include <asm/arch/imx-regs.h>
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
diff --git a/board/shannon/Makefile b/board/shannon/Makefile
index 86098a3..f66b096 100644
--- a/board/shannon/Makefile
+++ b/board/shannon/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := shannon.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/shannon/memsetup.S b/board/shannon/lowlevel_init.S
similarity index 97%
rename from board/shannon/memsetup.S
rename to board/shannon/lowlevel_init.S
index a9a8777..0655c42 100644
--- a/board/shannon/memsetup.S
+++ b/board/shannon/lowlevel_init.S
@@ -51,8 +51,8 @@
/* setting up the memory */
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
ldr r0, MEM_BASE
/* Setup the flash memory */
diff --git a/board/smdk2400/Makefile b/board/smdk2400/Makefile
index 367eabd..fc3d48f 100644
--- a/board/smdk2400/Makefile
+++ b/board/smdk2400/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := smdk2400.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/smdk2400/memsetup.S b/board/smdk2400/lowlevel_init.S
similarity index 98%
rename from board/smdk2400/memsetup.S
rename to board/smdk2400/lowlevel_init.S
index b507d81..a5de806 100644
--- a/board/smdk2400/memsetup.S
+++ b/board/smdk2400/lowlevel_init.S
@@ -125,8 +125,8 @@
_TEXT_BASE:
.word TEXT_BASE
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* memory control configuration */
/* make r0 relative the current location so that it */
/* reads SMRDATA out of FLASH rather than memory ! */
diff --git a/board/smdk2410/Makefile b/board/smdk2410/Makefile
index af1e6e6..4ee21f5 100644
--- a/board/smdk2410/Makefile
+++ b/board/smdk2410/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := smdk2410.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/smdk2410/memsetup.S b/board/smdk2410/lowlevel_init.S
similarity index 98%
rename from board/smdk2410/memsetup.S
rename to board/smdk2410/lowlevel_init.S
index c00e772..310f2a0 100644
--- a/board/smdk2410/memsetup.S
+++ b/board/smdk2410/lowlevel_init.S
@@ -129,8 +129,8 @@
_TEXT_BASE:
.word TEXT_BASE
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* memory control configuration */
/* make r0 relative the current location so that it */
/* reads SMRDATA out of FLASH rather than memory ! */
diff --git a/board/tb0229/Makefile b/board/tb0229/Makefile
index e7bb8cb..4375073 100644
--- a/board/tb0229/Makefile
+++ b/board/tb0229/Makefile
@@ -28,7 +28,7 @@
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)
diff --git a/board/tb0229/memsetup.S b/board/tb0229/lowlevel_init.S
similarity index 96%
rename from board/tb0229/memsetup.S
rename to board/tb0229/lowlevel_init.S
index 0eaf45d..df31806 100644
--- a/board/tb0229/memsetup.S
+++ b/board/tb0229/lowlevel_init.S
@@ -14,8 +14,8 @@
#include <asm/regdef.h>
- .globl memsetup
-memsetup:
+ .globl lowlevel_init
+lowlevel_init:
/* BCUCNTREG1 = 0x0040 */
la t0, 0xaf000000
diff --git a/board/trab/Makefile b/board/trab/Makefile
index 4e6e9d6..ced9bc5 100644
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -26,7 +26,7 @@
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`)
diff --git a/board/trab/memsetup.S b/board/trab/lowlevel_init.S
similarity index 98%
rename from board/trab/memsetup.S
rename to board/trab/lowlevel_init.S
index c93dff6..128ae7e 100644
--- a/board/trab/memsetup.S
+++ b/board/trab/lowlevel_init.S
@@ -140,8 +140,8 @@
_TEXT_BASE:
.word TEXT_BASE
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
/* memory control configuration */
/* make r0 relative the current location so that it */
/* reads SMRDATA out of FLASH rather than memory ! */
diff --git a/board/wepep250/Makefile b/board/wepep250/Makefile
index 802ccb9..11ad8fb 100644
--- a/board/wepep250/Makefile
+++ b/board/wepep250/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := wepep250.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/wepep250/memsetup.S b/board/wepep250/lowlevel_init.S
similarity index 98%
rename from board/wepep250/memsetup.S
rename to board/wepep250/lowlevel_init.S
index 26fc0ea..b172cea 100644
--- a/board/wepep250/memsetup.S
+++ b/board/wepep250/lowlevel_init.S
@@ -35,8 +35,8 @@
#include <version.h>
#include <asm/arch/pxa-regs.h>
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
diff --git a/board/xaeniax/Makefile b/board/xaeniax/Makefile
index da5a5ba..7c5f0cd 100644
--- a/board/xaeniax/Makefile
+++ b/board/xaeniax/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := xaeniax.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/xaeniax/memsetup.S b/board/xaeniax/lowlevel_init.S
similarity index 97%
rename from board/xaeniax/memsetup.S
rename to board/xaeniax/lowlevel_init.S
index 5c43b85..fe3e712 100644
--- a/board/xaeniax/memsetup.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 @@
.endm
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -416,9 +416,9 @@
#endif
/* ---------------------------------------------------------------- */
- /* End memsetup */
+ /* End lowlevel_init */
/* ---------------------------------------------------------------- */
-endmemsetup:
+endlowlevel_init:
mov pc, lr
diff --git a/board/xm250/Makefile b/board/xm250/Makefile
index 3572f72..1b0a3f0 100644
--- a/board/xm250/Makefile
+++ b/board/xm250/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := xm250.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $^
diff --git a/board/xm250/memsetup.S b/board/xm250/lowlevel_init.S
similarity index 98%
rename from board/xm250/memsetup.S
rename to board/xm250/lowlevel_init.S
index f68e843..2ebd395 100644
--- a/board/xm250/memsetup.S
+++ b/board/xm250/lowlevel_init.S
@@ -43,8 +43,8 @@
.endm
*/
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
@@ -516,4 +516,4 @@
mov pc, r10
-@ End memsetup
+@ End lowlevel_init
diff --git a/board/xsengine/Makefile b/board/xsengine/Makefile
index 591b728..ed1464a 100644
--- a/board/xsengine/Makefile
+++ b/board/xsengine/Makefile
@@ -26,7 +26,7 @@
LIB = lib$(BOARD).a
OBJS := xsengine.o flash.o
-SOBJS := memsetup.o
+SOBJS := lowlevel_init.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/xsengine/memsetup.S b/board/xsengine/lowlevel_init.S
similarity index 98%
rename from board/xsengine/memsetup.S
rename to board/xsengine/lowlevel_init.S
index b947118..309faab 100644
--- a/board/xsengine/memsetup.S
+++ b/board/xsengine/lowlevel_init.S
@@ -4,8 +4,8 @@
DRAM_SIZE: .long CFG_DRAM_SIZE
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
mov r10, lr
diff --git a/cpu/arm720t/start.S b/cpu/arm720t/start.S
index bde936a..0e15965 100644
--- a/cpu/arm720t/start.S
+++ b/cpu/arm720t/start.S
@@ -316,10 +316,10 @@
/*
* 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
diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index f348193..a7cabf8 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -257,10 +257,10 @@
/*
* 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
diff --git a/cpu/at91rm9200/lowlevel.S b/cpu/at91rm9200/lowlevel.S
index 030f9e1..c8af7a6 100644
--- 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 @@
.word SDRAM
.word SDRAM_VAL
/* SMRDATA1 is 176 bytes long */
-#endif /* CONFIG_BOOTBINFUNC */
+#endif /* CONFIG_INIT_CRITICAL */
diff --git a/cpu/at91rm9200/start.S b/cpu/at91rm9200/start.S
index 0dbc009..e897e6b 100644
--- a/cpu/at91rm9200/start.S
+++ b/cpu/at91rm9200/start.S
@@ -115,7 +115,7 @@
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 @@
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 @@
*/
#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 @@
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:
diff --git a/cpu/lh7a40x/start.S b/cpu/lh7a40x/start.S
index 4f023a5..5dca773 100644
--- a/cpu/lh7a40x/start.S
+++ b/cpu/lh7a40x/start.S
@@ -229,10 +229,10 @@
/*
* 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
diff --git a/cpu/mips/start.S b/cpu/mips/start.S
index 45a90a8..ff105a4 100644
--- a/cpu/mips/start.S
+++ b/cpu/mips/start.S
@@ -243,7 +243,7 @@
/* Initialize any external memory.
*/
- bal memsetup
+ bal lowlevel_init
nop
/* Initialize caches...
diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index d74f41f..da753a1 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -218,10 +218,10 @@
/*
* 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. */
diff --git a/cpu/s3c44b0/start.S b/cpu/s3c44b0/start.S
index b4b7c3f..fc7f592 100644
--- a/cpu/s3c44b0/start.S
+++ b/cpu/s3c44b0/start.S
@@ -117,9 +117,9 @@
/*
* 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 */
diff --git a/cpu/sa1100/start.S b/cpu/sa1100/start.S
index 7974344..08e41c7 100644
--- a/cpu/sa1100/start.S
+++ b/cpu/sa1100/start.S
@@ -213,10 +213,10 @@
/*
* 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
/*
diff --git a/doc/README.modnet50 b/doc/README.modnet50
index d8d9c9d..30338ce 100644
--- a/doc/README.modnet50
+++ b/doc/README.modnet50
@@ -47,7 +47,7 @@
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
diff --git a/include/configs/B2.h b/include/configs/B2.h
index 2fc97b2..b031826 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 de7f387..7c51a1b 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 9ca80ab..2c664d5 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 8146fe7..d32ec34 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 34efc38..5a0f460 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 2cec4c7..ca7a97b 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 1b39d23..0b2b251 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 f3a871b..b14e35b 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 d9dd620..41ad394 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 24b1779..9e0ed51 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 618b25a..dbb8dec 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 b4c1edf..dbc951d 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 f884519..a3d36a0 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 1add778..a8067f6 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 c98f377..3c9895a 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 2aee461..b320a40 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 808fe1c..6f2c32c 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 de465ea..e6855fb 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 efe205d..536a175 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 fd1b47c..166aa11 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 3f1419e..f7ccea3 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 11d21b2..af39e2e 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 88d6c46..552beed 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 beff6d8..9b82215 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 d0608dd..c00976e 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 43be807..cd2dbf1 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 ace380f..1bdea6c 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 f733803..9ba19c8 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 7afe62d..8a4e370 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 b95b8c0..f477575 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 7e3a02d..2a1cd77 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 e8c4373..6fda7b9 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 137d934..2f59260 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 a8a8ee5..ca32efb 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 fc3739f..1177003 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 10f69d9..1be7dd4 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 87d2c94..6b15766 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 */