summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2015-02-06 23:06:40 +0100
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-02-17 22:52:39 +0100
commitaa0ea2a5538ab7b0f3e8975a27ab8c0a764a69cd (patch)
treedd750d1c616d74d38afdb4d3e2d4d146c5f5cef6 /arch
parentdbdb5abd070163f59901884c672b49c25b1aeea9 (diff)
downloadblackbird-obmc-uboot-aa0ea2a5538ab7b0f3e8975a27ab8c0a764a69cd.tar.gz
blackbird-obmc-uboot-aa0ea2a5538ab7b0f3e8975a27ab8c0a764a69cd.zip
avr32: rename cpu_init() -> arch_cpu_init()
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/cpu/cpu.c2
-rw-r--r--arch/avr32/include/asm/u-boot.h2
-rw-r--r--arch/avr32/lib/board.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/avr32/cpu/cpu.c b/arch/avr32/cpu/cpu.c
index cef630ed45..cd226a6f71 100644
--- a/arch/avr32/cpu/cpu.c
+++ b/arch/avr32/cpu/cpu.c
@@ -27,7 +27,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int cpu_init(void)
+int arch_cpu_init(void)
{
extern void _evba(void);
diff --git a/arch/avr32/include/asm/u-boot.h b/arch/avr32/include/asm/u-boot.h
index 6aef808749..2387f8af62 100644
--- a/arch/avr32/include/asm/u-boot.h
+++ b/arch/avr32/include/asm/u-boot.h
@@ -25,4 +25,6 @@ typedef struct bd_info {
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_AVR32
+int arch_cpu_init(void);
+
#endif /* __ASM_U_BOOT_H__ */
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 7d13ac534b..95f95266f1 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -98,7 +98,7 @@ void board_init_f(ulong board_type)
/* Perform initialization sequence */
board_early_init_f();
- cpu_init();
+ arch_cpu_init();
board_postclk_init();
env_init();
init_baudrate();
OpenPOWER on IntegriCloud