diff options
| author | Vikas Manocha | 2018-08-31 16:57:06 -0700 |
|---|---|---|
| committer | Tom Rini | 2018-09-10 21:19:33 -0400 |
| commit | d22336aad945f8f67e2c985cea9220c3a559b909 (patch) | |
| tree | 4ac7a75fd8c1f0c98731c403f1c23f980624c6f2 | |
| parent | 680223a2da55d365f0bbc7207297fdb8569c30c2 (diff) | |
arm: armv7m: clean up armv7m unified code compilation
unified syntax should be selected by config ARM_ASM_UNIFIED
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
| -rw-r--r-- | arch/arm/include/asm/armv7m.h | 5 | ||||
| -rw-r--r-- | arch/arm/lib/crt0.S | 4 | ||||
| -rw-r--r-- | arch/arm/lib/relocate.S | 1 | ||||
| -rw-r--r-- | arch/arm/lib/vectors_m.S | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h index 278f302cdb5..ad67b4fa34e 100644 --- a/arch/arm/include/asm/armv7m.h +++ b/arch/arm/include/asm/armv7m.h @@ -10,11 +10,6 @@ #ifndef ARMV7M_H #define ARMV7M_H -#if defined(__ASSEMBLY__) -.syntax unified -.thumb -#endif - /* armv7m fixed base addresses */ #define V7M_SCS_BASE 0xE000E000 #define V7M_NVIC_BASE (V7M_SCS_BASE + 0x0100) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index d7ff9f0e5f9..fe312db6906 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -8,9 +8,7 @@ #include <config.h> #include <asm-offsets.h> #include <linux/linkage.h> -#ifdef CONFIG_CPU_V7M -#include <asm/armv7m.h> -#endif +#include <asm/assembler.h> /* * This file handles the target-independent stages of the U-Boot diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index c5b135db40e..e5f7267be19 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -6,6 +6,7 @@ */ #include <asm-offsets.h> +#include <asm/assembler.h> #include <config.h> #include <elf.h> #include <linux/linkage.h> diff --git a/arch/arm/lib/vectors_m.S b/arch/arm/lib/vectors_m.S index d75e47734b7..7d2d55c7f9f 100644 --- a/arch/arm/lib/vectors_m.S +++ b/arch/arm/lib/vectors_m.S @@ -5,7 +5,7 @@ */ #include <config.h> -#include <asm/armv7m.h> +#include <asm/assembler.h> #include <linux/linkage.h> .type __hard_fault_entry, %function |