From bc620a707de9e7fb1d238cd7f09085968d6ba159 Mon Sep 17 00:00:00 2001
From: Kofi Doku Atuah <kofidoku.atuah@data61.csiro.au>
Date: Thu, 24 Jan 2019 16:12:10 +1100
Subject: [PATCH] AArch32: Add __ASSEMBLER__ preprocessor guards for kernelBase

---
 include/arch/arm/arch/32/mode/hardware.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/arch/arm/arch/32/mode/hardware.h b/include/arch/arm/arch/32/mode/hardware.h
index b7fb4183e..70bee6a49 100644
--- a/include/arch/arm/arch/32/mode/hardware.h
+++ b/include/arch/arm/arch/32/mode/hardware.h
@@ -14,8 +14,10 @@
 #define __ARCH_HARDWARE_32_H
 
 #include <config.h>
+#ifndef __ASSEMBLER__
 #include <arch/machine/hardware.h>
 #include <plat/api/constants.h>
+#endif
 
 /*
  * 0xffe00000 asid id slot (arm/arch/kernel/vspace.h)
@@ -34,6 +36,8 @@
 #define KDEV_PPTR 0xfff00000
 #define PADDR_TOP (PPTR_TOP - BASE_OFFSET)
 
+#ifndef __ASSEMBLER__
 #include <plat/machine/hardware.h>
+#endif
 
 #endif /* __ARCH_HARDWARE_32_H */
-- 
GitLab