* [U-Boot] [PATCH] arch/arm/lib/bootm-fdt.c: Guard the include of <asm/armv7.h>
@ 2015-05-14 15:16 Tom Rini
0 siblings, 0 replies; only message in thread
From: Tom Rini @ 2015-05-14 15:16 UTC (permalink / raw)
To: u-boot
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>
---
arch/arm/lib/bootm-fdt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 0eb10a8..7677358 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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-05-14 15:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-14 15:16 [U-Boot] [PATCH] arch/arm/lib/bootm-fdt.c: Guard the include of <asm/armv7.h> Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.