diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/armv4/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/arch/arm/armv4/bootblock.S | 16 | ||||
| -rw-r--r-- | src/arch/arm/armv7/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/arm/armv7/bootblock.S | 6 | ||||
| -rw-r--r-- | src/arch/arm/include/arch/asm.h | 47 |
5 files changed, 58 insertions, 16 deletions
diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc index d054b31e4e..aa788688d0 100644 --- a/src/arch/arm/armv4/Makefile.inc +++ b/src/arch/arm/armv4/Makefile.inc @@ -19,7 +19,8 @@ ## ############################################################################### -armv4_flags = -marm -march=armv4t -I$(src)/arch/arm/include/armv4/ +armv4_flags = -marm -march=armv4t -I$(src)/arch/arm/include/armv4/ \ + -D__COREBOOT_ARM_ARCH__=4 ############################################################################### # bootblock 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 <arch/asm.h> -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 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 <arch/asm.h> + .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 diff --git a/src/arch/arm/include/arch/asm.h b/src/arch/arm/include/arch/asm.h new file mode 100644 index 0000000000..1c3f7a21c3 --- /dev/null +++ b/src/arch/arm/include/arch/asm.h @@ -0,0 +1,47 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2013 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __ARM_ASM_H +#define __ARM_ASM_H + +#if defined __arm__ +# define ARM(x...) x +# define THUMB(x...) +#elif defined __thumb__ +# define ARM(x...) +# define THUMB(x...) x +#else +# error Not in ARM or thumb mode! +#endif + +#define ALIGN .align 0 + +#define ENDPROC(name) \ + .type name, %function; \ + END(name) + +#define ENTRY(name) \ + .globl name; \ + ALIGN; \ + name: + +#define END(name) \ + .size name, .-name + +#endif /* __ARM_ASM_H */ |