summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-02-05 14:45:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-08 09:35:40 +0100
commitc49819d9034afa3cef7a150afb8d44c9dada09b0 (patch)
tree674a4a804897ed2780ef1cf7375098c36508536c /arch/arm/include
parent0fcceb6c55f588ce9048fe2c703c081951fdea5d (diff)
downloadbarebox-c49819d9034afa3cef7a150afb8d44c9dada09b0.tar.gz
barebox-c49819d9034afa3cef7a150afb8d44c9dada09b0.tar.xz
arm: rename reset and common_reset to barebox_arm_reset_vector and arm_cpu_lowlevel_init
reset is confusing with the cpu reset and impossible to grep Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/barebox-arm-head.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h
index bf00ff0c35..9d9b8549ea 100644
--- a/arch/arm/include/asm/barebox-arm-head.h
+++ b/arch/arm/include/asm/barebox-arm-head.h
@@ -5,7 +5,7 @@
#ifndef __ASSEMBLY__
-static inline void common_reset(void)
+static inline void arm_cpu_lowlevel_init(void)
{
uint32_t r;
@@ -45,12 +45,12 @@ static inline void barebox_arm_head(void)
"bx r9\n"
".thumb\n"
"1:\n"
- "bl reset\n"
+ "bl barebox_arm_reset_vector\n"
".rept 10\n"
"1: b 1b\n"
".endr\n"
#else
- "b reset\n"
+ "b barebox_arm_reset_vector\n"
"1: b 1b\n"
"1: b 1b\n"
"1: b 1b\n"
@@ -70,7 +70,7 @@ static inline void barebox_arm_head(void)
#else
-.macro common_reset, scratch
+.macro arm_cpu_lowlevel_init, scratch
/* set the cpu to SVC32 mode */
mrs \scratch, cpsr