aboutsummaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2013-01-04 16:29:29 -0800
committerRonald G. Minnich <rminnich@gmail.com>2013-01-05 01:41:14 +0100
commit2f25d9963ee6ba57db67a0410fcd932f4be18373 (patch)
tree94b4dcb9029535d445e1115000c1197b850194b6 /src/arch
parent9bcab0c72bea6188ebf735ce08ba269ef5f9a272 (diff)
ARMv7: drop __ASSEMBLY__
We moved to using __ASSEMBLER__ years ago since it is set by as. Change-Id: I60103ba23ebe87be1d0bc63beed0ef5b05eed4f2 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2111 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/include/system.h2
-rw-r--r--src/arch/armv7/init.S1
-rw-r--r--src/arch/armv7/start.S1
3 files changed, 1 insertions, 3 deletions
diff --git a/src/arch/armv7/include/system.h b/src/arch/armv7/include/system.h
index 3e14fdb0a5..c74ce8c20c 100644
--- a/src/arch/armv7/include/system.h
+++ b/src/arch/armv7/include/system.h
@@ -60,7 +60,7 @@
#define arch_align_stack(x) (x)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline unsigned int get_cr(void)
{
unsigned int val;
diff --git a/src/arch/armv7/init.S b/src/arch/armv7/init.S
index 033637e89a..7848581dae 100644
--- a/src/arch/armv7/init.S
+++ b/src/arch/armv7/init.S
@@ -29,7 +29,6 @@
* MA 02111-1307 USA
*/
-#define __ASSEMBLY__
#include <system.h>
.globl _start
diff --git a/src/arch/armv7/start.S b/src/arch/armv7/start.S
index 63cac4b98e..8af48eb71b 100644
--- a/src/arch/armv7/start.S
+++ b/src/arch/armv7/start.S
@@ -29,7 +29,6 @@
* MA 02111-1307 USA
*/
-#define __ASSEMBLY__
#include <system.h>
.globl _start