projects
/
platform
/
kernel
/
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
[platform/kernel/u-boot.git]
/
arch
/
arm
/
mach-mvebu
/
include
/
mach
/
cpu.h
diff --git
a/arch/arm/mach-mvebu/include/mach/cpu.h
b/arch/arm/mach-mvebu/include/mach/cpu.h
index
6fa4173
..
5e8bf0c
100644
(file)
--- a/
arch/arm/mach-mvebu/include/mach/cpu.h
+++ b/
arch/arm/mach-mvebu/include/mach/cpu.h
@@
-119,6
+119,8
@@
int mvebu_mbus_probe(struct mbus_win windows[], int count);
int mvebu_soc_family(void);
u32 mvebu_get_nand_clock(void);
+void return_to_bootrom(void);
+
int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks);
/*