diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-14 11:07:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-14 11:07:03 -0400 |
| commit | 4588d61a284aa2306d4b83954a650c066f1f569c (patch) | |
| tree | e17b5db64f9a41e3d3639c1f975117d83eddffe6 | |
| parent | 2068cea1731c7ec22a37acc0942357bf3b389001 (diff) | |
| download | talos-obmc-uboot-4588d61a284aa2306d4b83954a650c066f1f569c.tar.gz talos-obmc-uboot-4588d61a284aa2306d4b83954a650c066f1f569c.zip | |
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>
| -rw-r--r-- | arch/arm/lib/bootm-fdt.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |
