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
/
include
/
asm
/
arch-omap3
/
sys_proto.h
diff --git
a/arch/arm/include/asm/arch-omap3/sys_proto.h
b/arch/arm/include/asm/arch-omap3/sys_proto.h
index
34bd8c5
..
24563c0
100644
(file)
--- a/
arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/
arch/arm/include/asm/arch-omap3/sys_proto.h
@@
-23,6
+23,7
@@
struct emu_hal_params {
/* Board SDRC timing values */
struct board_sdrc_timings {
/* Board SDRC timing values */
struct board_sdrc_timings {
+ u32 sharing;
u32 mcfg;
u32 ctrla;
u32 ctrlb;
u32 mcfg;
u32 ctrla;
u32 ctrlb;
@@
-51,7
+52,6
@@
void set_muxconf_regs(void);
u32 get_cpu_family(void);
u32 get_cpu_rev(void);
u32 get_sku_id(void);
u32 get_cpu_family(void);
u32 get_cpu_rev(void);
u32 get_sku_id(void);
-u32 get_sysboot_value(void);
u32 is_gpmc_muxed(void);
u32 get_gpmc0_type(void);
u32 get_gpmc0_width(void);
u32 is_gpmc_muxed(void);
u32 get_gpmc0_type(void);
u32 get_gpmc0_width(void);
@@
-69,9
+69,9
@@
void sdelay(unsigned long);
void make_cs1_contiguous(void);
void omap_nand_switch_ecc(uint32_t, uint32_t);
void power_init_r(void);
void make_cs1_contiguous(void);
void omap_nand_switch_ecc(uint32_t, uint32_t);
void power_init_r(void);
-void dieid_num_r(void);
-void get_dieid(u32 *id);
void do_omap3_emu_romcode_call(u32 service_id, u32 parameters);
void do_omap3_emu_romcode_call(u32 service_id, u32 parameters);
-void omap3_
gp_romcode_call(u32 service_id, u32 paramete
r);
+void omap3_
set_aux_cr_secure(u32 ac
r);
u32 warm_reset(void);
u32 warm_reset(void);
+
+void save_omap_boot_params(void);
#endif
#endif