projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
u-boot-arm.h
diff --git
a/arch/arm/include/asm/u-boot-arm.h
b/arch/arm/include/asm/u-boot-arm.h
index e3fbb53d4da8b6e5fc83871a9ff66b2e5f6a5c45..9f3cae5ece49dda74466f840a1792f4930b978b2 100644
(file)
--- a/
arch/arm/include/asm/u-boot-arm.h
+++ b/
arch/arm/include/asm/u-boot-arm.h
@@
-46,9
+46,13
@@
extern ulong IRQ_STACK_START_IN; /* 8 bytes in IRQ stack */
int cpu_init(void);
int cleanup_before_linux(void);
int cpu_init(void);
int cleanup_before_linux(void);
+/* Set up ARMv7 MMU, caches and TLBs */
+void cpu_init_cp15(void);
+
/* cpu/.../arch/cpu.c */
int arch_cpu_init(void);
int arch_misc_init(void);
/* cpu/.../arch/cpu.c */
int arch_cpu_init(void);
int arch_misc_init(void);
+int arch_early_init_r(void);
/* board/.../... */
int board_init(void);
/* board/.../... */
int board_init(void);
@@
-63,7
+67,4
@@
void reset_timer_masked (void);
ulong get_timer_masked (void);
void udelay_masked (unsigned long usec);
ulong get_timer_masked (void);
void udelay_masked (unsigned long usec);
-/* cpu/.../timer.c */
-int timer_init (void);
-
#endif /* _U_BOOT_ARM_H_ */
#endif /* _U_BOOT_ARM_H_ */