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/armv4/bootblock.S | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'src/arch/arm/armv4/bootblock.S') diff --git a/src/arch/arm/armv4/bootblock.S b/src/arch/arm/armv4/bootblock.S index 3ba2a88e26..58a34cff7e 100644 --- a/src/arch/arm/armv4/bootblock.S +++ b/src/arch/arm/armv4/bootblock.S @@ -29,19 +29,10 @@ * MA 02111-1307 USA */ -.section ".start", "a", %progbits -.globl _start -_start: b reset - .balignl 16,0xdeadbeef - -_cbfs_master_header: - /* The CBFS master header is inserted by cbfstool at the first - * aligned offset after the above anchor string is found. - * Hence, we leave some space for it. - */ - .skip 128 @ Assumes 64-byte alignment +#include -reset: +.section ".start", "a", %progbits +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 @@ -84,6 +75,7 @@ call_bootblock: * wrapper which is currently broken. */ bl main +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