From: Tom Rini <trini@konsulko.com>
Date: Thu, 14 May 2015 15:07:03 +0000 (-0400)
Subject: arch/arm/lib/bootm-fdt.c: Guard the include of <asm/armv7.h>
X-Git-Tag: v2025.01-rc5-pxa1908~12996
X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=4588d61a284aa2306d4b83954a650c066f1f569c;p=u-boot.git

arch/arm/lib/bootm-fdt.c: Guard the include of <asm/armv7.h>

With d6b72da0 we started including this file unconditionally.  This
isn't allowed in a file that we also use on armv8.  This will get
cleaned up a bit better once we really start using these same features
(and have similar fdt updates needed) on armv8.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 0eb10a8687..7677358742 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -17,7 +17,9 @@
 
 #include <common.h>
 #include <fdt_support.h>
+#ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
+#endif
 #include <asm/psci.h>
 
 DECLARE_GLOBAL_DATA_PTR;