X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_ppc%2Fboard.c;h=92ebbd9411cfd53ed1922ac5debf0fb7b8fddb84;hb=fa838874cf29a18ce11371c048358f683c74ff0e;hp=333d2d25c10406fc28e4643b50d14d0d33357bee;hpb=3b57fe0a70b903f4db66c558bb9828bc58acf06b;p=u-boot diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 333d2d25c1..92ebbd9411 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2002 + * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -26,13 +26,15 @@ #include #include #include -#include #ifdef CONFIG_8xx #include #endif #ifdef CONFIG_5xx #include #endif +#ifdef CONFIG_MPC5xxx +#include +#endif #if (CONFIG_COMMANDS & CFG_CMD_IDE) #include #endif @@ -46,11 +48,9 @@ #include #endif #include -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) -#include -#endif +#include #ifdef CFG_ALLOC_DPRAM -#if !defined(CONFIG_8260) +#if !(defined(CONFIG_8260)||defined(CONFIG_MPC8560)) #include #endif #endif @@ -65,6 +65,12 @@ #if defined(CONFIG_LOGBUFFER) #include #endif +#if defined(CFG_INIT_RAM_LOCK) && defined(CONFIG_E500) +#include +#endif +#ifdef CONFIG_PS2KBD +#include +#endif #if (CONFIG_COMMANDS & CFG_CMD_DOC) void doc_init (void); @@ -79,15 +85,17 @@ void nand_init (void); static char *failed = "*** failed ***\n"; -#if defined(CONFIG_PCU_E) || defined(CONFIG_OXC) +#if defined(CONFIG_OXC) || defined(CONFIG_PCU_E) || defined(CONFIG_RMU) extern flash_info_t flash_info[]; #endif #include -#if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \ - (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \ - defined(CFG_ENV_IS_IN_NVRAM) +#if defined(CFG_ENV_IS_EMBEDDED) +#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN +#elif ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \ + (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \ + defined(CFG_ENV_IS_IN_NVRAM) #define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + CFG_ENV_SIZE) #else #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN @@ -95,9 +103,12 @@ extern flash_info_t flash_info[]; extern ulong __init_end; extern ulong _end; - ulong monitor_flash_len; +#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) +#include +#endif + /* * Begin and End of memory area for malloc(), and current "brk" */ @@ -153,37 +164,6 @@ char *strmhz (char *buf, long hz) return (buf); } -static void syscalls_init (void) -{ - ulong *addr; - - syscall_tbl[SYSCALL_MALLOC] = (void *) malloc; - syscall_tbl[SYSCALL_FREE] = (void *) free; - - syscall_tbl[SYSCALL_INSTALL_HDLR] = (void *) irq_install_handler; - syscall_tbl[SYSCALL_FREE_HDLR] = (void *) irq_free_handler; - syscall_tbl[SYSCALL_GET_TIMER] = (void *)get_timer; - syscall_tbl[SYSCALL_UDELAY] = (void *)udelay; - - addr = (ulong *) 0xc00; /* syscall ISR addr */ - - /* patch ISR code */ - *addr++ |= (ulong) syscall_tbl >> 16; - *addr++ |= (ulong) syscall_tbl & 0xFFFF; - *addr++ |= NR_SYSCALLS >> 16; - *addr++ |= NR_SYSCALLS & 0xFFFF; - -#ifndef CONFIG_5XX - flush_cache (0x0C00, 0x10); -#endif - /* Initialize syscalls stack pointer */ - addr = (ulong *) 0xCFC; - *addr = (ulong)addr; -#ifndef CONFIG_5xx - flush_cache ((ulong)addr, 0x10); -#endif -} - /* * All attempts to come up with a "common" initialization sequence * that works for all boards and architectures failed: some of the @@ -280,14 +260,19 @@ static int init_func_watchdog_reset (void) init_fnc_t *init_sequence[] = { -#if defined(CONFIG_BOARD_PRE_INIT) - board_pre_init, /* very early board init code (fpga boot, etc.) */ +#if defined(CONFIG_BOARD_EARLY_INIT_F) + board_early_init_f, #endif +#if !defined(CONFIG_8xx_CPUCLK_DEFAULT) get_clocks, /* get CPU and bus clocks (etc.) */ +#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) + adjust_sdram_tbs_8xx, +#endif init_timebase, +#endif #ifdef CFG_ALLOC_DPRAM -#if !defined(CONFIG_8260) +#if !(defined(CONFIG_8260) || defined(CONFIG_MPC8560)) dpram_init, #endif #endif @@ -295,6 +280,11 @@ init_fnc_t *init_sequence[] = { board_postclk_init, #endif env_init, +#if defined(CONFIG_8xx_CPUCLK_DEFAULT) + get_clocks_866, /* get CPU and bus clocks according to the environment variable */ + sdram_adjust_866, /* adjust sdram refresh rate according to the new clock */ + init_timebase, +#endif init_baudrate, serial_init, console_init_f, @@ -304,13 +294,15 @@ init_fnc_t *init_sequence[] = { prt_8260_clks, #endif /* CONFIG_8260 */ checkcpu, +#if defined(CONFIG_MPC5xxx) + prt_mpc5xxx_clks, +#endif /* CONFIG_MPC5xxx */ +#if defined(CONFIG_MPC8220) + prt_mpc8220_clks, +#endif checkboard, INIT_FUNC_WATCHDOG_INIT -#if defined(CONFIG_BMW) || \ - defined(CONFIG_COGENT) || \ - defined(CONFIG_HYMOD) || \ - defined(CONFIG_RSD_PROTO) || \ - defined(CONFIG_W7O) +#if defined(CONFIG_MISC_INIT_F) misc_init_f, #endif INIT_FUNC_WATCHDOG_RESET @@ -365,8 +357,10 @@ void board_init_f (ulong bootflag) /* Pointer is writable since we allocated a register for it */ gd = (gd_t *) (CFG_INIT_RAM_ADDR + CFG_GBL_DATA_OFFSET); + /* compiler optimization barrier needed for GCC >= 3.4 */ + __asm__ __volatile__("": : :"memory"); -#ifndef CONFIG_8260 +#if !(defined(CONFIG_8260) || defined(CONFIG_MPC8560)) /* Clear initial global data */ memset ((void *) gd, 0, sizeof (gd_t)); #endif @@ -382,7 +376,7 @@ void board_init_f (ulong bootflag) * relocate the code and continue running from DRAM. * * Reserve memory at end of RAM for (top down in that order): - * - kernel log buffer + * - kernel log buffer * - protected RAM * - LCD framebuffer * - monitor code @@ -401,9 +395,7 @@ void board_init_f (ulong bootflag) #ifdef CONFIG_LOGBUFFER /* reserve kernel log buffer */ addr -= (LOGBUFF_RESERVE); -# ifdef DEBUG - printf ("Reserving %ldk for kernel logbuffer at %08lx\n", LOGBUFF_LEN, addr); -# endif + debug ("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN, addr); #endif #ifdef CONFIG_PRAM @@ -413,16 +405,12 @@ void board_init_f (ulong bootflag) i = getenv_r ("pram", tmp, sizeof (tmp)); reg = (i > 0) ? simple_strtoul (tmp, NULL, 10) : CONFIG_PRAM; addr -= (reg << 10); /* size is in kB */ -# ifdef DEBUG - printf ("Reserving %ldk for protected RAM at %08lx\n", reg, addr); -# endif + debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr); #endif /* CONFIG_PRAM */ /* round down to next 4 kB limit */ addr &= ~(4096 - 1); -#ifdef DEBUG - printf ("Top of RAM usable for U-Boot at: %08lx\n", addr); -#endif + debug ("Top of RAM usable for U-Boot at: %08lx\n", addr); #ifdef CONFIG_LCD /* reserve memory for LCD display (always full pages) */ @@ -438,14 +426,12 @@ void board_init_f (ulong bootflag) /* * reserve memory for U-Boot code, data & bss - * round down to next 16 kB limit + * round down to next 4 kB limit */ addr -= len; - addr &= ~(16 * 1024 - 1); + addr &= ~(4096 - 1); -#ifdef DEBUG - printf ("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr); -#endif + debug ("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr); #ifdef CONFIG_AMIGAONEG3SE gd->relocaddr = addr; @@ -455,10 +441,8 @@ void board_init_f (ulong bootflag) * reserve memory for malloc() arena */ addr_sp = addr - TOTAL_MALLOC_LEN; -#ifdef DEBUG - printf ("Reserving %dk for malloc() at: %08lx\n", + debug ("Reserving %dk for malloc() at: %08lx\n", TOTAL_MALLOC_LEN >> 10, addr_sp); -#endif /* * (permanently) allocate a Board Info struct @@ -467,16 +451,12 @@ void board_init_f (ulong bootflag) addr_sp -= sizeof (bd_t); bd = (bd_t *) addr_sp; gd->bd = bd; -#ifdef DEBUG - printf ("Reserving %d Bytes for Board Info at: %08lx\n", + debug ("Reserving %d Bytes for Board Info at: %08lx\n", sizeof (bd_t), addr_sp); -#endif addr_sp -= sizeof (gd_t); id = (gd_t *) addr_sp; -#ifdef DEBUG - printf ("Reserving %d Bytes for Global Data at: %08lx\n", + debug ("Reserving %d Bytes for Global Data at: %08lx\n", sizeof (gd_t), addr_sp); -#endif /* * Finally, we set up a new (bigger) stack. @@ -488,41 +468,69 @@ void board_init_f (ulong bootflag) addr_sp &= ~0xF; *((ulong *) addr_sp)-- = 0; *((ulong *) addr_sp)-- = 0; -#ifdef DEBUG - printf ("Stack Pointer at: %08lx\n", addr_sp); -#endif + debug ("Stack Pointer at: %08lx\n", addr_sp); /* * Save local variables to board info struct */ - bd->bi_memstart = CFG_SDRAM_BASE; /* start of DRAM memory */ + bd->bi_memstart = CFG_SDRAM_BASE; /* start of DRAM memory */ bd->bi_memsize = gd->ram_size; /* size of DRAM memory in bytes */ #ifdef CONFIG_IP860 - bd->bi_sramstart = SRAM_BASE; /* start of SRAM memory */ - bd->bi_sramsize = SRAM_SIZE; /* size of SRAM memory */ + bd->bi_sramstart = SRAM_BASE; /* start of SRAM memory */ + bd->bi_sramsize = SRAM_SIZE; /* size of SRAM memory */ +#elif defined CONFIG_MPC8220 + bd->bi_sramstart = CFG_SRAM_BASE; /* start of SRAM memory */ + bd->bi_sramsize = CFG_SRAM_SIZE; /* size of SRAM memory */ #else - bd->bi_sramstart = 0; /* FIXME */ /* start of SRAM memory */ - bd->bi_sramsize = 0; /* FIXME */ /* size of SRAM memory */ + bd->bi_sramstart = 0; /* FIXME */ /* start of SRAM memory */ + bd->bi_sramsize = 0; /* FIXME */ /* size of SRAM memory */ #endif -#if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) +#if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) || \ + defined(CONFIG_E500) bd->bi_immr_base = CFG_IMMR; /* base of IMMR register */ #endif +#if defined(CONFIG_MPC5xxx) + bd->bi_mbar_base = CFG_MBAR; /* base of internal registers */ +#endif +#if defined(CONFIG_MPC8220) + bd->bi_mbar_base = CFG_MBAR; /* base of internal registers */ + bd->bi_inpfreq = gd->inp_clk; + bd->bi_pcifreq = gd->pci_clk; + bd->bi_vcofreq = gd->vco_clk; + bd->bi_pevfreq = gd->pev_clk; + bd->bi_flbfreq = gd->flb_clk; + + /* store bootparam to sram (backward compatible), here? */ + { + u32 *sram = (u32 *)CFG_SRAM_BASE; + *sram++ = gd->ram_size; + *sram++ = gd->bus_clk; + *sram++ = gd->inp_clk; + *sram++ = gd->cpu_clk; + *sram++ = gd->vco_clk; + *sram++ = gd->flb_clk; + *sram++ = 0xb8c3ba11; /* boot signature */ + } +#endif bd->bi_bootflags = bootflag; /* boot / reboot flag (for LynxOS) */ WATCHDOG_RESET (); bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */ bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */ -#if defined(CONFIG_8260) +#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) bd->bi_cpmfreq = gd->cpm_clk; bd->bi_brgfreq = gd->brg_clk; bd->bi_sccfreq = gd->scc_clk; bd->bi_vco = gd->vco_out; #endif /* CONFIG_8260 */ - +#if defined(CONFIG_MPC5xxx) + bd->bi_ipbfreq = gd->ipb_clk; + bd->bi_pcifreq = gd->pci_clk; +#endif /* CONFIG_MPC5xxx */ bd->bi_baudrate = gd->baudrate; /* Console Baudrate */ #ifdef CFG_EXTBDINFO @@ -533,12 +541,13 @@ void board_init_f (ulong bootflag) bd->bi_plb_busfreq = gd->bus_clk; #if defined(CONFIG_405GP) || defined(CONFIG_405EP) bd->bi_pci_busfreq = get_PCI_freq (); + bd->bi_opbfreq = get_OPB_freq (); +#elif defined(CONFIG_XILINX_ML300) + bd->bi_pci_busfreq = get_PCI_freq (); #endif #endif -#ifdef DEBUG - printf ("New Stack Pointer is: %08lx\n", addr_sp); -#endif + debug ("New Stack Pointer is: %08lx\n", addr_sp); WATCHDOG_RESET (); @@ -549,7 +558,7 @@ void board_init_f (ulong bootflag) WATCHDOG_RESET(); - memcpy (id, gd, sizeof (gd_t)); + memcpy (id, (void *)gd, sizeof (gd_t)); relocate_code (addr_sp, id, addr); @@ -570,7 +579,6 @@ void board_init_f (ulong bootflag) void board_init_r (gd_t *id, ulong dest_addr) { DECLARE_GLOBAL_DATA_PTR; - cmd_tbl_t *cmdtp; char *s, *e; bd_t *bd; @@ -589,22 +597,27 @@ void board_init_r (gd_t *id, ulong dest_addr) gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ -#ifdef DEBUG - printf ("Now running in RAM - U-Boot at: %08lx\n", dest_addr); -#endif + debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr); WATCHDOG_RESET (); +#if defined(CONFIG_BOARD_EARLY_INIT_R) + board_early_init_r (); +#endif + gd->reloc_off = dest_addr - CFG_MONITOR_BASE; - + monitor_flash_len = (ulong)&__init_end - dest_addr; +#ifdef CONFIG_SERIAL_MULTI + serial_initialize(); +#endif + /* * We have to relocate the command table manually */ - for (cmdtp = &cmd_tbl[0]; cmdtp->name; cmdtp++) { + for (cmdtp = &__u_boot_cmd_start; cmdtp != &__u_boot_cmd_end; cmdtp++) { ulong addr; - addr = (ulong) (cmdtp->cmd) + gd->reloc_off; #if 0 printf ("Command \"%s\": 0x%08lx => 0x%08lx\n", @@ -648,6 +661,10 @@ void board_init_r (gd_t *id, ulong dest_addr) icache_enable (); /* it's time to enable the instruction cache */ #endif +#if defined(CFG_INIT_RAM_LOCK) && defined(CONFIG_E500) + unlock_ram_in_cache(); /* it's time to unlock D-cache in e500 */ +#endif + #if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45) /* * Do PCI configuration on BAB7xx and CPC45 _before_ the flash @@ -674,7 +691,7 @@ void board_init_r (gd_t *id, ulong dest_addr) puts ("FLASH: "); if ((flash_size = flash_init ()) > 0) { -#ifdef CFG_FLASH_CHECKSUM +# ifdef CFG_FLASH_CHECKSUM print_size (flash_size, ""); /* * Compute and print flash CRC if flashchecksum is set to 'y' @@ -684,15 +701,13 @@ void board_init_r (gd_t *id, ulong dest_addr) s = getenv ("flashchecksum"); if (s && (*s == 'y')) { printf (" CRC: %08lX", - crc32 (0, - (const unsigned char *) CFG_FLASH_BASE, - flash_size) - ); + crc32 (0, (const unsigned char *) CFG_FLASH_BASE, flash_size) + ); } putc ('\n'); -#else +# else /* !CFG_FLASH_CHECKSUM */ print_size (flash_size, "\n"); -#endif /* CFG_FLASH_CHECKSUM */ +# endif /* CFG_FLASH_CHECKSUM */ } else { puts (failed); hang (); @@ -700,14 +715,15 @@ void board_init_r (gd_t *id, ulong dest_addr) bd->bi_flashstart = CFG_FLASH_BASE; /* update start of FLASH memory */ bd->bi_flashsize = flash_size; /* size of FLASH memory (final value) */ -#if defined(CONFIG_PCU_E) || defined(CONFIG_OXC) - bd->bi_flashoffset = 0; -#elif CFG_MONITOR_BASE == CFG_FLASH_BASE +# if defined(CONFIG_PCU_E) || defined(CONFIG_OXC) || defined(CONFIG_RMU) + /* flash mapped at end of memory map */ + bd->bi_flashoffset = TEXT_BASE + flash_size; +# elif CFG_MONITOR_BASE == CFG_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor */ -#else +# else bd->bi_flashoffset = 0; -#endif -#else +# endif +#else /* CFG_NO_FLASH */ bd->bi_flashsize = 0; bd->bi_flashstart = 0; @@ -737,11 +753,36 @@ void board_init_r (gd_t *id, ulong dest_addr) /* * Fill in missing fields of bd_info. - * We do this here, where we have "normal" access to the - * environment; we used to do this still running from ROM, - * where had to use getenv_r(), which can be pretty slow when - * the environment is in EEPROM. + * We do this here, where we have "normal" access to the + * environment; we used to do this still running from ROM, + * where had to use getenv_r(), which can be pretty slow when + * the environment is in EEPROM. + */ + +#if defined(CFG_EXTBDINFO) +#if defined(CONFIG_405GP) || defined(CONFIG_405EP) +#if defined(CONFIG_I2CFAST) + /* + * set bi_iic_fast for linux taking environment variable + * "i2cfast" into account */ + { + char *s = getenv ("i2cfast"); + if (s && ((*s == 'y') || (*s == 'Y'))) { + bd->bi_iic_fast[0] = 1; + bd->bi_iic_fast[1] = 1; + } else { + bd->bi_iic_fast[0] = 0; + bd->bi_iic_fast[1] = 0; + } + } +#else + bd->bi_iic_fast[0] = 0; + bd->bi_iic_fast[1] = 0; +#endif /* CONFIG_I2CFAST */ +#endif /* CONFIG_405GP, CONFIG_405EP */ +#endif /* CFG_EXTBDINFO */ + s = getenv ("ethaddr"); #if defined (CONFIG_MBX) || defined (CONFIG_RPXCLASSIC) || defined(CONFIG_IAD210) if (s == NULL) @@ -764,7 +805,7 @@ void board_init_r (gd_t *id, ulong dest_addr) load_sernum_ethaddr (); #endif -#if defined(CFG_GT_6426x) || defined(CONFIG_PN62) +#if defined(CONFIG_ETH1ADDR) /* handle the 2nd ethernet address */ s = getenv ("eth1addr"); @@ -775,11 +816,15 @@ void board_init_r (gd_t *id, ulong dest_addr) s = (*e) ? e + 1 : e; } #endif -#if defined(CFG_GT_6426x) +#if defined(CONFIG_ETH2ADDR) /* handle the 3rd ethernet address */ s = getenv ("eth2addr"); - +#if defined(CONFIG_XPEDITE1K) + if (s == NULL) + board_get_enetaddr(bd->bi_enet2addr); + else +#endif for (i = 0; i < 6; ++i) { bd->bi_enet2addr[i] = s ? simple_strtoul (s, &e, 16) : 0; if (s) @@ -787,9 +832,23 @@ void board_init_r (gd_t *id, ulong dest_addr) } #endif +#if defined(CONFIG_ETH3ADDR) + /* handle 4th ethernet address */ + s = getenv("eth3addr"); +#if defined(CONFIG_XPEDITE1K) + if (s == NULL) + board_get_enetaddr(bd->bi_enet3addr); + else +#endif + for (i = 0; i < 6; ++i) { + bd->bi_enet3addr[i] = s ? simple_strtoul (s, &e, 16) : 0; + if (s) + s = (*e) ? e + 1 : e; + } +#endif #if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \ - defined(CONFIG_CCM) + defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X) load_sernum_ethaddr (); #endif /* IP Address */ @@ -797,7 +856,7 @@ void board_init_r (gd_t *id, ulong dest_addr) WATCHDOG_RESET (); -#if defined(CONFIG_PCI) && !defined(CONFIG_BAB7xx) +#if defined(CONFIG_PCI) && !defined(CONFIG_BAB7xx) && !defined(CONFIG_CPC45) /* * Do pci configuration */ @@ -808,20 +867,18 @@ void board_init_r (gd_t *id, ulong dest_addr) /* Initialize devices */ devices_init (); - /* allocate syscalls table (console_init_r will fill it in */ - syscall_tbl = (void **) malloc (NR_SYSCALLS * sizeof (void *)); + /* Initialize the jump table for applications */ + jumptable_init (); /* Initialize the console (after the relocation and devices init) */ console_init_r (); -/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/ - syscalls_init (); #if defined(CONFIG_CCM) || \ defined(CONFIG_COGENT) || \ defined(CONFIG_CPCI405) || \ defined(CONFIG_EVB64260) || \ - defined(CONFIG_HYMOD) || \ defined(CONFIG_KUP4K) || \ + defined(CONFIG_KUP4X) || \ defined(CONFIG_LWMON) || \ defined(CONFIG_PCU_E) || \ defined(CONFIG_W7O) || \ @@ -842,17 +899,16 @@ void board_init_r (gd_t *id, ulong dest_addr) defined(CONFIG_IP860) || \ defined(CONFIG_IVML24) || \ defined(CONFIG_IVMS8) || \ - defined(CONFIG_LWMON) || \ defined(CONFIG_MPC8260ADS) || \ defined(CONFIG_MPC8266ADS) || \ + defined(CONFIG_MPC8560ADS) || \ defined(CONFIG_PCU_E) || \ defined(CONFIG_RPXSUPER) || \ + defined(CONFIG_STXGP3) || \ defined(CONFIG_SPD823TS) ) WATCHDOG_RESET (); -# ifdef DEBUG - puts ("Reset Ethernet PHY\n"); -# endif + debug ("Reset Ethernet PHY\n"); reset_phy (); #endif @@ -862,9 +918,7 @@ void board_init_r (gd_t *id, ulong dest_addr) kgdb_init (); #endif -#ifdef DEBUG - printf ("U-Boot relocated to %08lx\n", dest_addr); -#endif + debug ("U-Boot relocated to %08lx\n", dest_addr); /* * Enable Interrupts @@ -886,8 +940,6 @@ void board_init_r (gd_t *id, ulong dest_addr) set_timer (0); - /* Insert function pointers now that we have relocated the code */ - /* Initialize from environment */ if ((s = getenv ("loadaddr")) != NULL) { load_addr = simple_strtoul (s, NULL, 16); @@ -914,6 +966,7 @@ void board_init_r (gd_t *id, ulong dest_addr) #if (CONFIG_COMMANDS & CFG_CMD_NAND) WATCHDOG_RESET (); + puts ("NAND:"); nand_init(); /* go init the NAND */ #endif @@ -925,10 +978,6 @@ void board_init_r (gd_t *id, ulong dest_addr) #ifdef CONFIG_POST post_run (NULL, POST_RAM | post_bootmode_get(0)); - if (post_bootmode_get(0) & POST_POWERFAIL) { - post_bootmode_clear(); - board_poweroff(); - } #endif #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE) @@ -990,6 +1039,11 @@ void board_init_r (gd_t *id, ulong dest_addr) } #endif +#ifdef CONFIG_PS2KBD + puts ("PS/2: "); + kbd_init(); +#endif + #ifdef CONFIG_MODEM_SUPPORT { extern int do_mdm_init; @@ -1011,6 +1065,9 @@ void board_init_r (gd_t *id, ulong dest_addr) void hang (void) { puts ("### ERROR ### Please RESET the board ###\n"); +#ifdef CONFIG_SHOW_BOOT_PROGRESS + show_boot_progress(-30); +#endif for (;;); }