diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-14 07:01:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-14 07:01:11 -0400 |
| commit | 9597494ebfb60418e8a0e7565cca2b7d25512bf5 (patch) | |
| tree | 3d84f37f77b366526bd7316ed74f0218ef4f0dd6 /arch/arm/include/asm/armv7.h | |
| parent | 14539bad49f0a2a53db2d57658de55ab89ab5758 (diff) | |
| parent | 237c36379c76f7f6647bb11c03aa9c5cb9a4972f (diff) | |
| download | u-boot-imx-9597494ebfb60418e8a0e7565cca2b7d25512bf5.zip u-boot-imx-9597494ebfb60418e8a0e7565cca2b7d25512bf5.tar.gz u-boot-imx-9597494ebfb60418e8a0e7565cca2b7d25512bf5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/include/asm/armv7.h')
| -rw-r--r-- | arch/arm/include/asm/armv7.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index cbe7dc1..30e7939 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -131,9 +131,10 @@ void v7_outer_cache_inval_all(void); void v7_outer_cache_flush_range(u32 start, u32 end); void v7_outer_cache_inval_range(u32 start, u32 end); -#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) +#ifdef CONFIG_ARMV7_NONSEC int armv7_init_nonsec(void); +int armv7_apply_memory_carveout(u64 *start, u64 *size); bool armv7_boot_nonsec(void); /* defined in assembly file */ @@ -145,7 +146,7 @@ void _smp_pen(void); extern char __secure_start[]; extern char __secure_end[]; -#endif /* CONFIG_ARMV7_NONSEC || CONFIG_ARMV7_VIRT */ +#endif /* CONFIG_ARMV7_NONSEC */ void v7_arch_cp15_set_l2aux_ctrl(u32 l2auxctrl, u32 cpu_midr, u32 cpu_rev_comb, u32 cpu_variant, |