commit d22336aad945f8f67e2c985cea9220c3a559b909
author Vikas Manocha <vikas.manocha@st.com> Fri Aug 31 16:57:06 2018 -0700
committer Tom Rini <trini@konsulko.com> Mon Sep 10 21:19:33 2018 -0400
tree 4ac7a75fd8c1f0c98731c403f1c23f980624c6f2
parent 680223a2da55d365f0bbc7207297fdb8569c30c2

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>

arch/arm/lib/crt0.S

diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index d7ff9f0..fe312db 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

arch/arm/lib/relocate.S

diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index c5b135d..e5f7267 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>

arch/arm/lib/vectors_m.S

diff --git a/arch/arm/lib/vectors_m.S b/arch/arm/lib/vectors_m.S
index d75e477..7d2d55c 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