leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nios2: fix style in board.c.

Browse Source 
Make nios2's board.c checkpatch clean.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Andreas Bießmann 2013-04-18 22:48:47 +00:00 committed by Tom Rini
parent 50ffb1174c
commit 63495ad77a
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
arch/nios2/lib/board.c
View File

@ -64,7 +64,6 @@ typedef int (init_fnc_t) (void);
***********************************************************************/ ***********************************************************************/
init_fnc_t *init_sequence[] = { init_fnc_t *init_sequence[] = {
#if defined(CONFIG_BOARD_EARLY_INIT_F) #if defined(CONFIG_BOARD_EARLY_INIT_F)
board_early_init_f, /* Call board-specific init code early.*/ board_early_init_f, /* Call board-specific init code early.*/
#endif #endif
@ -83,7 +82,7 @@ init_fnc_t *init_sequence[] = {
/***********************************************************************/ /***********************************************************************/
void board_init (void) void board_init(void)
{ {
bd_t *bd; bd_t *bd;
init_fnc_t **init_fnc_ptr; init_fnc_t **init_fnc_ptr;
@ -93,7 +92,7 @@ void board_init (void)
/* Pointer is writable since we allocated a register for it. */ /* Pointer is writable since we allocated a register for it. */
gd = &gd_data; gd = &gd_data;
/* compiler optimization barrier needed for GCC >= 3.4 */ /* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory"); __asm__ __volatile__("" : : : "memory");
gd->bd = &bd_data; gd->bd = &bd_data;
gd->baudrate = CONFIG_BAUDRATE; gd->baudrate = CONFIG_BAUDRATE;
@ -106,25 +105,24 @@ void board_init (void)
bd->bi_flashstart = CONFIG_SYS_FLASH_BASE; bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
#endif #endif
#if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE) #if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE)
bd->bi_sramstart= CONFIG_SYS_SRAM_BASE; bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;
bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;
#endif #endif
bd->bi_baudrate = CONFIG_BAUDRATE; bd->bi_baudrate = CONFIG_BAUDRATE;
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
WATCHDOG_RESET (); WATCHDOG_RESET();
if ((*init_fnc_ptr) () != 0) { if ((*init_fnc_ptr) () != 0)
hang (); hang();
}
} }
WATCHDOG_RESET (); WATCHDOG_RESET();
/* The Malloc area is immediately below the monitor copy in RAM */ /* The Malloc area is immediately below the monitor copy in RAM */
mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN); mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
#ifndef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
WATCHDOG_RESET (); WATCHDOG_RESET();
bd->bi_flashsize = flash_init(); bd->bi_flashsize = flash_init();
#endif #endif
@ -138,39 +136,40 @@ void board_init (void)
mmc_initialize(bd); mmc_initialize(bd);
#endif #endif
WATCHDOG_RESET (); WATCHDOG_RESET();
env_relocate(); env_relocate();
WATCHDOG_RESET (); WATCHDOG_RESET();
stdio_init(); stdio_init();
jumptable_init(); jumptable_init();
console_init_r(); console_init_r();
WATCHDOG_RESET (); WATCHDOG_RESET();
interrupt_init (); interrupt_init();
#if defined(CONFIG_BOARD_LATE_INIT) #if defined(CONFIG_BOARD_LATE_INIT)
board_late_init (); board_late_init();
#endif #endif
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
puts ("Net: "); puts("Net: ");
eth_initialize (bd); eth_initialize(bd);
#endif #endif
/* main_loop */ /* main_loop */
for (;;) { for (;;) {
WATCHDOG_RESET (); WATCHDOG_RESET();
main_loop (); main_loop();
} }
} }
/***********************************************************************/ /***********************************************************************/
void hang (void) void hang(void)
{ {
disable_interrupts (); disable_interrupts();
puts("### ERROR ### Please reset board ###\n"); puts("### ERROR ### Please reset board ###\n");
for (;;); for (;;)
;
} }