sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/arm'

This commit is contained in:
Sascha Hauer 2014-02-03 09:52:34 +01:00
parent bd8ba3c6a3 b35e927f7f
commit fd6fe68e95
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -216,7 +216,7 @@ config AEABI
config THUMB2_BAREBOX config THUMB2_BAREBOX
select ARM_ASM_UNIFIED select ARM_ASM_UNIFIED
select AEABI select AEABI
depends on CPU_V7 depends on CPU_V7 && !CPU_32v4T && !CPU_32v5 && !CPU_32v6
bool "Compile barebox in thumb-2 mode (read help)" bool "Compile barebox in thumb-2 mode (read help)"
help help
This enables compilation of barebox in thumb-2 mode which generates This enables compilation of barebox in thumb-2 mode which generates

2
arch/arm/cpu/Makefile
View File

@ -17,7 +17,9 @@ obj-$(CONFIG_CPU_32v5) += cache-armv5.o
pbl-$(CONFIG_CPU_32v5) += cache-armv5.o pbl-$(CONFIG_CPU_32v5) += cache-armv5.o
obj-$(CONFIG_CPU_32v6) += cache-armv6.o obj-$(CONFIG_CPU_32v6) += cache-armv6.o
pbl-$(CONFIG_CPU_32v6) += cache-armv6.o pbl-$(CONFIG_CPU_32v6) += cache-armv6.o
AFLAGS_cache-armv7.o :=-Wa,-march=armv7-a
obj-$(CONFIG_CPU_32v7) += cache-armv7.o obj-$(CONFIG_CPU_32v7) += cache-armv7.o
AFLAGS_pbl-cache-armv7.o :=-Wa,-march=armv7-a
pbl-$(CONFIG_CPU_32v7) += cache-armv7.o pbl-$(CONFIG_CPU_32v7) += cache-armv7.o
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o

2
arch/arm/cpu/cache.c
View File

@ -102,7 +102,7 @@ int arm_set_cache_functions(void)
break; break;
#endif #endif
default: default:
BUG(); while(1);
} }
return 0; return 0;

14
arch/arm/cpu/common.c
View File

@ -18,6 +18,7 @@
#include <common.h> #include <common.h>
#include <init.h> #include <init.h>
#include <sizes.h> #include <sizes.h>
#include <asm/system_info.h>
#include <asm/barebox-arm.h> #include <asm/barebox-arm.h>
#include <asm/barebox-arm-head.h> #include <asm/barebox-arm-head.h>
#include <asm-generic/memory_layout.h> #include <asm-generic/memory_layout.h>
@ -64,3 +65,16 @@ void relocate_to_current_adr(void)
arm_early_mmu_cache_flush(); arm_early_mmu_cache_flush();
flush_icache(); 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

14
arch/arm/cpu/cpu.c
View File

@ -29,7 +29,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/memory.h> #include <asm/memory.h>
#include <asm-generic/memory_layout.h> #include <asm-generic/memory_layout.h>
#include <asm/system_info.h>
#include <asm/cputype.h> #include <asm/cputype.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
@ -146,16 +145,3 @@ static int execute_init(void)
} }
postcore_initcall(execute_init); postcore_initcall(execute_init);
#endif #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