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/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