projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OMAP3: beagle-xm: generate fake USB ethernet MAC address from dieid
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
armv7.h
diff --git
a/arch/arm/include/asm/armv7.h
b/arch/arm/include/asm/armv7.h
index 2efd4bcf424d45c3d8c41386b2fce00bb722caa8..395444ee4f1557cd5a7c88678d9480150f5b1a4d 100644
(file)
--- a/
arch/arm/include/asm/armv7.h
+++ b/
arch/arm/include/asm/armv7.h
@@
-76,14
+76,16
@@
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);
void v7_outer_cache_flush_range(u32 start, u32 end);
void v7_outer_cache_inval_range(u32 start, u32 end);
-#if
def CONFIG_ARMV7_NONSEC
+#if
defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
int armv7_switch_nonsec(void);
int armv7_switch_nonsec(void);
+int armv7_switch_hyp(void);
/* defined in assembly file */
unsigned int _nonsec_init(void);
void _smp_pen(void);
/* defined in assembly file */
unsigned int _nonsec_init(void);
void _smp_pen(void);
-#endif /* CONFIG_ARMV7_NONSEC */
+void _switch_to_hyp(void);
+#endif /* CONFIG_ARMV7_NONSEC || CONFIG_ARMV7_VIRT */
#endif /* ! __ASSEMBLY__ */
#endif /* ! __ASSEMBLY__ */