diff options
Diffstat (limited to 'arch/arm/include/asm/arch-omap4/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/sys_proto.h | 12 | 
1 files changed, 4 insertions, 8 deletions
| diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index d5f1868ee..039a1f260 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -27,6 +27,8 @@  #include <asm/omap_common.h>  #include <asm/arch/mux_omap4.h> +DECLARE_GLOBAL_DATA_PTR; +  struct omap_sysinfo {  	char *board_string;  }; @@ -58,13 +60,7 @@ void omap_vc_init(u16 speed_khz);  int omap_vc_bypass_send_value(u8 sa, u8 reg_addr, u8 reg_data);  u32 warm_reset(void);  void force_emif_self_refresh(void); -/* - * This is used to verify if the configuration header - * was executed by Romcode prior to control of transfer - * to the bootloader. SPL is responsible for saving and - * passing this to the u-boot. - */ -extern struct omap_boot_parameters boot_params; +void setup_warmreset_time(void);  static inline u32 running_from_sdram(void)  { @@ -84,7 +80,7 @@ static inline u8 uboot_loaded_by_spl(void)  	 * variable by both SPL and u-boot.Check out for CHSETTINGS, which is a  	 * mandatory section if CH is present.  	 */ -	if ((boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS)) +	if ((gd->arch.omap_boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS))  		return 0;  	else  		return running_from_sdram(); |