diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-28 09:41:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-29 10:31:02 +0100 |
| commit | b35e927f7fc93fd8a390d2d9efd77f6c3cf0e5ad (patch) | |
| tree | 35946f73b8afff9d63688116427ff82f7ecd7ebe /arch/arm/cpu | |
| parent | 8aba2cbd9394362fc68e4a310f53b3a2492daed4 (diff) | |
| download | barebox-b35e927f7fc93fd8a390d2d9efd77f6c3cf0e5ad.tar.gz barebox-b35e927f7fc93fd8a390d2d9efd77f6c3cf0e5ad.tar.xz | |
ARM: mode cpu_architecture() to common.c
It might be needed in pbl code, so move it to a file which is
compiled in pbl mode.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/common.c | 14 | ||||
| -rw-r--r-- | arch/arm/cpu/cpu.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c index 40f784f02a..d5f892910f 100644 --- a/arch/arm/cpu/common.c +++ b/arch/arm/cpu/common.c @@ -18,6 +18,7 @@ #include <common.h> #include <init.h> #include <sizes.h> +#include <asm/system_info.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <asm-generic/memory_layout.h> @@ -64,3 +65,16 @@ void relocate_to_current_adr(void) arm_early_mmu_cache_flush(); flush_icache(); } + +#ifdef ARM_MULTIARCH + +int __cpu_architecture; + +int __pure cpu_architecture(void) +{ + if(__cpu_architecture == CPU_ARCH_UNKNOWN) + __cpu_architecture = arm_early_get_cpu_architecture(); + + return __cpu_architecture; +} +#endif diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index f2e698d430..895e07ef3e 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -29,7 +29,6 @@ #include <asm/system.h> #include <asm/memory.h> #include <asm-generic/memory_layout.h> -#include <asm/system_info.h> #include <asm/cputype.h> #include <asm/cache.h> #include <asm/ptrace.h> @@ -146,16 +145,3 @@ static int execute_init(void) } postcore_initcall(execute_init); #endif - -#ifdef ARM_MULTIARCH - -int __cpu_architecture; - -int __pure cpu_architecture(void) -{ - if(__cpu_architecture == CPU_ARCH_UNKNOWN) - __cpu_architecture = arm_early_get_cpu_architecture(); - - return __cpu_architecture; -} -#endif |