Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move #ifdef(CONFIG_DISPLAY_CPUINFO) from caller to callee

Browse source 
- When CONFIG_DISPLAY_CPUINFO is not enabled,
   print_cpuinfo() should be defined as an empty function
   in a header, include/common.h

 - Remove #ifdef CONFIG_DISPLAY_CPUINFO .. #endif
   from caller, common/board_f.c and arch/arm/lib/board.c

 - Remove redundant prototypes in arch/arm/lib/board.c,
   arch/arm/include/asm/arch-am33x/sys_proto.h and
   board/nokia/rx51/rx51.h, keeping the one in include/common.h

 - Add #ifdef CONFIG_DISPLAY_CPUINFO to the func definition
   where it is missing

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2014-02-13 18:30:26 +09:00 committed by Tom Rini
parent 2f13363b09
commit 365475e6d1
8 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/cpu/armv7/omap-common/hwinit-common.c
View file

@ -248,6 +248,7 @@ u32 get_device_type(void)
(DEVICE_TYPE_MASK)) >> DEVICE_TYPE_SHIFT; (DEVICE_TYPE_MASK)) >> DEVICE_TYPE_SHIFT;
} }
#if defined(CONFIG_DISPLAY_CPUINFO)
/* /*
* Print CPU information * Print CPU information
*/ */
@ -258,6 +259,8 @@ int print_cpuinfo(void)
return 0; return 0;
} }
#endif
#ifndef CONFIG_SYS_DCACHE_OFF #ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void) void enable_caches(void)
{ {

4
arch/arm/include/asm/arch-am33xx/sys_proto.h
View file

@ -17,10 +17,6 @@
u32 get_cpu_rev(void); u32 get_cpu_rev(void);
u32 get_sysboot_value(void); u32 get_sysboot_value(void);
#ifdef CONFIG_DISPLAY_CPUINFO
int print_cpuinfo(void);
#endif
extern struct ctrl_stat *cstat; extern struct ctrl_stat *cstat;
u32 get_device_type(void); u32 get_device_type(void);
void save_omap_boot_params(void); void save_omap_boot_params(void);

4
arch/arm/lib/board.c
View file

@ -197,8 +197,6 @@ static int arm_pci_init(void)
*/ */
typedef int (init_fnc_t) (void); typedef int (init_fnc_t) (void);
int print_cpuinfo(void);
void __dram_init_banksize(void) void __dram_init_banksize(void)
{ {
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
@ -250,9 +248,7 @@ init_fnc_t *init_sequence[] = {
serial_init, /* serial communications setup */ serial_init, /* serial communications setup */
console_init_f, /* stage 1 init of console */ console_init_f, /* stage 1 init of console */
display_banner, /* say that we are here */ display_banner, /* say that we are here */
#if defined(CONFIG_DISPLAY_CPUINFO)
print_cpuinfo, /* display cpu info (and speed) */ print_cpuinfo, /* display cpu info (and speed) */
#endif
#if defined(CONFIG_DISPLAY_BOARDINFO) #if defined(CONFIG_DISPLAY_BOARDINFO)
checkboard, /* display board info */ checkboard, /* display board info */
#endif #endif

2
board/altera/socfpga/socfpga_cyclone5.c
View file

@ -12,6 +12,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_DISPLAY_CPUINFO)
/* /*
* Print CPU information * Print CPU information
*/ */
@ -20,6 +21,7 @@ int print_cpuinfo(void)
puts("CPU : Altera SOCFPGA Platform\n"); puts("CPU : Altera SOCFPGA Platform\n");
return 0; return 0;
} }
#endif
/* /*
* Print Board information * Print Board information

2
board/freescale/mx53loco/mx53loco.c
View file

@ -343,6 +343,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo(void) int print_cpuinfo(void)
{ {
u32 cpurev; u32 cpurev;
@ -356,6 +357,7 @@ int print_cpuinfo(void)
printf("Reset cause: %s\n", get_reset_cause()); printf("Reset cause: %s\n", get_reset_cause());
return 0; return 0;
} }
#endif
/* /*
* Do not overwrite the console * Do not overwrite the console

2
board/nokia/rx51/rx51.h
View file

@ -22,8 +22,6 @@ struct emu_hal_params_rx51 {
u32 param4; u32 param4;
}; };
int print_cpuinfo(void);
/* /*
* IEN - Input Enable * IEN - Input Enable
* IDIS - Input Disable * IDIS - Input Disable

2
common/board_f.c
View file

@ -887,9 +887,7 @@ static init_fnc_t init_sequence_f[] = {
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
checkcpu, checkcpu,
#endif #endif
#if defined(CONFIG_DISPLAY_CPUINFO)
print_cpuinfo, /* display cpu info (and speed) */ print_cpuinfo, /* display cpu info (and speed) */
#endif
#if defined(CONFIG_MPC5xxx) #if defined(CONFIG_MPC5xxx)
prt_mpc5xxx_clks, prt_mpc5xxx_clks,
#endif /* CONFIG_MPC5xxx */ #endif /* CONFIG_MPC5xxx */

7
include/common.h
View file

@ -304,7 +304,14 @@ extern ulong monitor_flash_len;
int mac_read_from_eeprom(void); int mac_read_from_eeprom(void);
extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_begin[]; /* embedded device tree blob */
int set_cpu_clk_info(void); int set_cpu_clk_info(void);
#if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo(void); int print_cpuinfo(void);
#else
static inline int print_cpuinfo(void)
{
return 0;
}
#endif
int update_flash_size(int flash_size); int update_flash_size(int flash_size);
/** /**