From 64b9ca9d4eb5eccdea86d967220c67b503a4519b Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 12 Dec 2013 20:24:48 -0800 Subject: arm: Move libgcc assembly macros to arch/asm.h libgcc/macros.h contains some useful assembly macros that are common in Linux kernel code and facilitate things such as unified ARM/THUMB assembly. This patch moves it to a more general place where it can be used by other code as well. Change-Id: If68e8930aaafa706c54cf9a156fac826b31bb193 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/182178 Reviewed-by: Vincent Palatin (cherry picked from commit a780670def94a969829811fa8cf257f12b88f085) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6917 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks --- src/arch/arm/armv7/Makefile.inc | 2 +- src/arch/arm/armv7/bootblock.S | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/arch/arm/armv7') diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index 2cc42bb63f..033d498d47 100644 --- a/src/arch/arm/armv7/Makefile.inc +++ b/src/arch/arm/armv7/Makefile.inc @@ -20,7 +20,7 @@ ############################################################################### armv7_flags = -march=armv7-a -mthumb -mthumb-interwork \ - -I$(src)/arch/arm/include/armv7/ + -I$(src)/arch/arm/include/armv7/ -D__COREBOOT_ARM_ARCH__=7 ############################################################################### # bootblock diff --git a/src/arch/arm/armv7/bootblock.S b/src/arch/arm/armv7/bootblock.S index cfe65e5393..a8d0973034 100644 --- a/src/arch/arm/armv7/bootblock.S +++ b/src/arch/arm/armv7/bootblock.S @@ -29,9 +29,10 @@ * MA 02111-1307 USA */ +#include + .section ".start", "a", %progbits -.globl _start -_start: +ENTRY(_start) /* * Set the cpu to System mode with IRQ and FIQ disabled. Prefetch/Data * aborts may happen early and crash before the abort handlers are @@ -89,6 +90,7 @@ call_bootblock: wait_for_interrupt: wfi mov pc, lr @ back to my caller +ENDPROC(_start) /* we do it this way because it's a 32-bit constant and * in some cases too far away to be loaded as just an offset -- cgit v1.2.3