X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Fmips%2Flib%2Fboard.c;h=d79e1837d9a37c21c07556618a22dc9c60e173e7;hp=f3171241556a9e3ae59eb3b4058d1379cfa00146;hb=612404c28a64a6df300642a1550a65dcc8e01f82;hpb=3388db2cd72d85717596158131b3e48efe2acfea diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index f317124155..d79e1837d9 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -24,8 +24,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -39,27 +39,15 @@ DECLARE_GLOBAL_DATA_PTR; -#undef DEBUG - -extern int timer_init(void); - -extern int incaip_set_cpuclk(void); - -extern ulong uboot_end_data; -extern ulong uboot_end; - ulong monitor_flash_len; -const char version_string[] = - U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"; - static char *failed = "*** failed ***\n"; /* * mips_io_port_base is the begin of the address space to which x86 style * I/O ports are mapped. */ -unsigned long mips_io_port_base = -1; +const unsigned long mips_io_port_base = -1; int __board_early_init_f(void) { @@ -68,51 +56,46 @@ 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 > 0) { + 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) { - char tmp[64]; /* long enough for environment variables */ - int i = getenv_f("baudrate", tmp, sizeof (tmp)); - - gd->baudrate = (i > 0) - ? (int) simple_strtoul (tmp, NULL, 10) - : CONFIG_BAUDRATE; - - return (0); + gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE); + return 0; } @@ -136,16 +119,16 @@ static int init_baudrate (void) * argument, and returns an integer return code, where 0 means * "continue" and != 0 means "fatal error, hang the system". */ -typedef int (init_fnc_t) (void); +typedef int (init_fnc_t)(void); init_fnc_t *init_sequence[] = { board_early_init_f, timer_init, env_init, /* initialize environment */ #ifdef CONFIG_INCA_IP - incaip_set_cpuclk, /* set cpu clock according to environment variable */ + incaip_set_cpuclk, /* set cpu clock according to env. variable */ #endif - init_baudrate, /* initialze baudrate settings */ + init_baudrate, /* initialize baudrate settings */ serial_init, /* serial communications setup */ console_init_f, display_banner, /* say that we are here */ @@ -162,22 +145,18 @@ void board_init_f(ulong bootflag) init_fnc_t **init_fnc_ptr; ulong addr, addr_sp, len = (ulong)&uboot_end - CONFIG_SYS_MONITOR_BASE; ulong *s; -#ifdef CONFIG_PURPLE - void copy_code (ulong); -#endif /* 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(); } /* @@ -192,7 +171,7 @@ void board_init_f(ulong bootflag) /* 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 * round down to next 16 kB limit @@ -200,12 +179,12 @@ void board_init_f(ulong bootflag) 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. */ 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); /* @@ -215,19 +194,19 @@ 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. */ 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); /* @@ -242,65 +221,56 @@ 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_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM */ + bd->bi_memsize = gd->ram_size; /* size of DRAM in bytes */ bd->bi_baudrate = gd->baudrate; /* Console Baudrate */ - memcpy (id, (void *)gd, sizeof (gd_t)); - - /* On the purple board we copy the code in a special way - * in order to solve flash problems - */ -#ifdef CONFIG_PURPLE - copy_code(addr); -#endif + 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 */ } -/************************************************************************ - * + +/* * This is the next part if the initialization sequence: we are now * running from RAM and have a "normal" C environment, i. e. global * data can be written, BSS has been cleared, the stack size in not * that critical any more, etc. - * - ************************************************************************ */ -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); #ifndef CONFIG_ENV_IS_NOWHERE - extern char * env_name_spec; + extern char *env_name_spec; #endif - char *s; bd_t *bd; 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; + serial_initialize(); + #if defined(CONFIG_NEEDS_MANUAL_RELOC) /* * We have to relocate the command table manually */ - fixup_cmdtable(&__u_boot_cmd_start, - (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); + fixup_cmdtable(ll_entry_start(cmd_tbl_t, cmd), + ll_entry_count(cmd_tbl_t, cmd)); #endif /* defined(CONFIG_NEEDS_MANUAL_RELOC) */ /* there are some other pointer constants we must deal with */ @@ -318,20 +288,24 @@ 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_flashstart = CONFIG_SYS_FLASH_BASE; bd->bi_flashsize = size; -#endif - bd->bi_flashstart = CONFIG_SYS_FLASH_BASE; #if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */ #else bd->bi_flashoffset = 0; #endif +#else + bd->bi_flashstart = 0; + bd->bi_flashsize = 0; + bd->bi_flashoffset = 0; +#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) @@ -341,9 +315,6 @@ void board_init_r (gd_t *id, ulong dest_addr) /* relocate environment function pointers etc. */ env_relocate(); - /* IP Address */ - bd->bi_ip_addr = getenv_IPaddr("ipaddr"); - #if defined(CONFIG_PCI) /* * Do pci configuration @@ -353,55 +324,46 @@ void board_init_r (gd_t *id, ulong dest_addr) /** 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 */ - if ((s = getenv ("loadaddr")) != NULL) { - load_addr = simple_strtoul (s, NULL, 16); - } -#if defined(CONFIG_CMD_NET) - if ((s = getenv ("bootfile")) != NULL) { - copy_filename (BootFile, s, sizeof (BootFile)); - } -#endif + load_addr = getenv_ulong("loadaddr", 16, load_addr); #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) -#if defined(CONFIG_NET_MULTI) - puts ("Net: "); -#endif + 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 (;;) + ; }