diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-am33xx/sys_proto.h | 4 | ||||
| -rw-r--r-- | arch/arm/lib/board.c | 4 | 
3 files changed, 3 insertions, 8 deletions
| diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index bf2951031..ade744e31 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -248,6 +248,7 @@ u32 get_device_type(void)  				      (DEVICE_TYPE_MASK)) >> DEVICE_TYPE_SHIFT;  } +#if defined(CONFIG_DISPLAY_CPUINFO)  /*   * Print CPU information   */ @@ -258,6 +259,8 @@ int print_cpuinfo(void)  	return 0;  } +#endif +  #ifndef CONFIG_SYS_DCACHE_OFF  void enable_caches(void)  { diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h index 87b7d367b..2e5c356e4 100644 --- a/arch/arm/include/asm/arch-am33xx/sys_proto.h +++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h @@ -17,10 +17,6 @@  u32 get_cpu_rev(void);  u32 get_sysboot_value(void); -#ifdef CONFIG_DISPLAY_CPUINFO -int print_cpuinfo(void); -#endif -  extern struct ctrl_stat *cstat;  u32 get_device_type(void);  void save_omap_boot_params(void); diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 38b9c7d3c..c320a3516 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -197,8 +197,6 @@ static int arm_pci_init(void)   */  typedef int (init_fnc_t) (void); -int print_cpuinfo(void); -  void __dram_init_banksize(void)  {  	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; @@ -250,9 +248,7 @@ init_fnc_t *init_sequence[] = {  	serial_init,		/* serial communications setup */  	console_init_f,		/* stage 1 init of console */  	display_banner,		/* say that we are here */ -#if defined(CONFIG_DISPLAY_CPUINFO)  	print_cpuinfo,		/* display cpu info (and speed) */ -#endif  #if defined(CONFIG_DISPLAY_BOARDINFO)  	checkboard,		/* display board info */  #endif |