WARNING: line over 80 characters
WARNING: space prohibited between function name and open parenthesis '('
WARNING: braces {} are not necessary for single statement blocks
ERROR: return is not a function, parentheses are not required
ERROR: do not use assignment in if condition
ERROR: trailing statements should be on next line
ERROR: "foo * bar" should be "foo *bar"
ERROR: spaces required around that ':' (ctx:WxV)
Signed-off-by: Daniel Schwierzeck <daniel.schwierz...@googlemail.com>
---
Changes for v2:
- fixed additional single line and multi line comments
arch/mips/lib/board.c | 146 +++++++++++++++++++++++--------------------------
1 files changed, 69 insertions(+), 77 deletions(-)
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 1274d63..cd7e942 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -64,42 +64,43 @@ int __board_early_init_f(void)
*/
return 0;
}
-int board_early_init_f(void) __attribute__((weak,
alias("__board_early_init_f")));
+int board_early_init_f(void)
+ __attribute__((weak, alias("__board_early_init_f")));
-static int init_func_ram (void)
+static int init_func_ram(void)
{
#ifdef CONFIG_BOARD_TYPES
int board_type = gd->board_type;
#else
int board_type = 0; /* use dummy arg */
#endif
- puts ("DRAM: ");
+ puts("DRAM: ");
- if ((gd->ram_size = initdram (board_type)) > 0) {
- print_size (gd->ram_size, "\n");
- return (0);
+ gd->ram_size = initdram(board_type);
+ if (gd->ram_size) {
+ print_size(gd->ram_size, "\n");
+ return 0;
}
- puts (failed);
- return (1);
+ puts(failed);
+ return 1;
}
static int display_banner(void)
{
-
- printf ("\n\n%s\n\n", version_string);
- return (0);
+ printf("\n\n%s\n\n", version_string);
+ return 0;
}
#ifndef CONFIG_SYS_NO_FLASH
static void display_flash_config(ulong size)
{
- puts ("Flash: ");
- print_size (size, "\n");
+ puts("Flash: ");
+ print_size(size, "\n");
}
#endif
-static int init_baudrate (void)
+static int init_baudrate(void)
{
gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
return 0;
@@ -133,7 +134,8 @@ init_fnc_t *init_sequence[] = {
timer_init,
env_init, /* initialize environment */
#ifdef CONFIG_INCA_IP
- incaip_set_cpuclk, /* set cpu clock according to environment
variable */
+ /* set cpu clock according to environment variable */
+ incaip_set_cpuclk,
#endif
init_baudrate, /* initialze baudrate settings */
serial_init, /* serial communications setup */
@@ -153,18 +155,17 @@ void board_init_f(ulong bootflag)
ulong addr, addr_sp, len = (ulong)&uboot_end - CONFIG_SYS_MONITOR_BASE;
ulong *s;
- /* Pointer is writable since we allocated a register for it.
- */
+ /* Pointer is writable since we allocated a register for it. */
gd = &gd_data;
+
/* compiler optimization barrier needed for GCC >= 3.4 */
- __asm__ __volatile__("": : :"memory");
+ __asm__ __volatile__("" : : : "memory");
- memset ((void *)gd, 0, sizeof (gd_t));
+ memset((void *)gd, 0, sizeof(gd_t));
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
- if ((*init_fnc_ptr)() != 0) {
- hang ();
- }
+ if ((*init_fnc_ptr)() != 0)
+ hang();
}
/*
@@ -173,26 +174,24 @@ void board_init_f(ulong bootflag)
*/
addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size;
- /* We can reserve some RAM "on top" here.
- */
+ /* We can reserve some RAM "on top" here. */
- /* round down to next 4 kB limit.
- */
+ /* round down to next 4 kB limit. */
addr &= ~(4096 - 1);
- debug ("Top of RAM usable for U-Boot at: %08lx\n", addr);
+ debug("Top of RAM usable for U-Boot at: %08lx\n", addr);
- /* Reserve memory for U-Boot code, data & bss
+ /*
+ * Reserve memory for U-Boot code, data & bss
* round down to next 16 kB limit
*/
addr -= len;
addr &= ~(16 * 1024 - 1);
- debug ("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);
+ debug("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);
- /* Reserve memory for malloc() arena.
- */
+ /* Reserve memory for malloc() arena. */
addr_sp = addr - TOTAL_MALLOC_LEN;
- debug ("Reserving %dk for malloc() at: %08lx\n",
+ debug("Reserving %dk for malloc() at: %08lx\n",
TOTAL_MALLOC_LEN >> 10, addr_sp);
/*
@@ -202,19 +201,18 @@ void board_init_f(ulong bootflag)
addr_sp -= sizeof(bd_t);
bd = (bd_t *)addr_sp;
gd->bd = bd;
- debug ("Reserving %zu Bytes for Board Info at: %08lx\n",
+ debug("Reserving %zu Bytes for Board Info at: %08lx\n",
sizeof(bd_t), addr_sp);
addr_sp -= sizeof(gd_t);
id = (gd_t *)addr_sp;
- debug ("Reserving %zu Bytes for Global Data at: %08lx\n",
- sizeof (gd_t), addr_sp);
+ debug("Reserving %zu Bytes for Global Data at: %08lx\n",
+ sizeof(gd_t), addr_sp);
- /* Reserve memory for boot params.
- */
+ /* Reserve memory for boot params. */
addr_sp -= CONFIG_SYS_BOOTPARAMS_LEN;
bd->bi_boot_params = addr_sp;
- debug ("Reserving %dk for boot params() at: %08lx\n",
+ debug("Reserving %dk for boot params() at: %08lx\n",
CONFIG_SYS_BOOTPARAMS_LEN >> 10, addr_sp);
/*
@@ -229,18 +227,16 @@ void board_init_f(ulong bootflag)
*s-- = 0;
*s-- = 0;
addr_sp = (ulong)s;
- debug ("Stack Pointer at: %08lx\n", addr_sp);
+ debug("Stack Pointer at: %08lx\n", addr_sp);
- /*
- * Save local variables to board info struct
- */
- bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM
memory */
- bd->bi_memsize = gd->ram_size; /* size of DRAM memory in
bytes */
- bd->bi_baudrate = gd->baudrate; /* Console Baudrate */
+ /* Save local variables to board info struct */
+ bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM memory */
+ bd->bi_memsize = gd->ram_size; /* size of DRAM memory in bytes */
+ bd->bi_baudrate = gd->baudrate; /* Console Baudrate */
- memcpy (id, (void *)gd, sizeof (gd_t));
+ memcpy(id, (void *)gd, sizeof(gd_t));
- relocate_code (addr_sp, id, addr);
+ relocate_code(addr_sp, id, addr);
/* NOTREACHED - relocate_code() does not return */
}
@@ -254,14 +250,14 @@ void board_init_f(ulong bootflag)
************************************************************************
*/
-void board_init_r (gd_t *id, ulong dest_addr)
+void board_init_r(gd_t *id, ulong dest_addr)
{
#ifndef CONFIG_SYS_NO_FLASH
ulong size;
#endif
- extern void malloc_bin_reloc (void);
+ extern void malloc_bin_reloc(void);
#ifndef CONFIG_ENV_IS_NOWHERE
- extern char * env_name_spec;
+ extern char *env_name_spec;
#endif
char *s;
bd_t *bd;
@@ -269,16 +265,14 @@ void board_init_r (gd_t *id, ulong dest_addr)
gd = id;
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
- debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
+ debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE;
monitor_flash_len = (ulong)&uboot_end_data - dest_addr;
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
- /*
- * We have to relocate the command table manually
- */
+ /* We have to relocate the command table manually */
fixup_cmdtable(&__u_boot_cmd_start,
(ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start));
#endif /* defined(CONFIG_NEEDS_MANUAL_RELOC) */
@@ -298,7 +292,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#ifndef CONFIG_SYS_NO_FLASH
/* configure available FLASH banks */
size = flash_init();
- display_flash_config (size);
+ display_flash_config(size);
bd->bi_flashsize = size;
#endif
@@ -310,8 +304,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif
#ifdef CONFIG_CMD_NAND
- puts ("NAND: ");
- nand_init (); /* go init the NAND */
+ puts("NAND: ");
+ nand_init(); /* go init the NAND */
#endif
#if defined(CONFIG_CMD_ONENAND)
@@ -325,59 +319,57 @@ void board_init_r (gd_t *id, ulong dest_addr)
bd->bi_ip_addr = getenv_IPaddr("ipaddr");
#if defined(CONFIG_PCI)
- /*
- * Do pci configuration
- */
+ /* Do pci configuration */
pci_init();
#endif
/** leave this here (after malloc(), environment and PCI are working) **/
/* Initialize stdio devices */
- stdio_init ();
+ stdio_init();
- jumptable_init ();
+ jumptable_init();
/* Initialize the console (after the relocation and devices init) */
- console_init_r ();
+ console_init_r();
/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
/* Initialize from environment */
load_addr = getenv_ulong("loadaddr", 16, load_addr);
#if defined(CONFIG_CMD_NET)
- if ((s = getenv ("bootfile")) != NULL) {
- copy_filename (BootFile, s, sizeof (BootFile));
- }
+ s = getenv("bootfile");
+ if (s)
+ copy_filename(BootFile, s, sizeof(BootFile));
#endif
#ifdef CONFIG_CMD_SPI
- puts ("SPI: ");
- spi_init (); /* go init the SPI */
- puts ("ready\n");
+ puts("SPI: ");
+ spi_init(); /* go init the SPI */
+ puts("ready\n");
#endif
#if defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */
- misc_init_r ();
+ misc_init_r();
#endif
#ifdef CONFIG_BITBANGMII
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
- puts ("Net: ");
+ puts("Net: ");
eth_initialize(gd->bd);
#endif
/* main_loop() can return to retry autoboot, if so just run it again. */
- for (;;) {
- main_loop ();
- }
+ for (;;)
+ main_loop();
/* NOTREACHED - no way out of command loop except booting */
}
-void hang (void)
+void hang(void)
{
- puts ("### ERROR ### Please RESET the board ###\n");
- for (;;);
+ puts("### ERROR ### Please RESET the board ###\n");
+ for (;;)
+ ;
}
--
1.7.7.2
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
