diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 2 | ||||
| -rw-r--r-- | common/board_f.c | 20 | ||||
| -rw-r--r-- | common/board_r.c | 31 |
3 files changed, 3 insertions, 50 deletions
diff --git a/common/Kconfig b/common/Kconfig index 0beeb0eff0..1e0c627341 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -387,7 +387,7 @@ config DISPLAY_CPUINFO config DISPLAY_BOARDINFO bool "Display information about the board during start up" - default y if ARM || M68K || MIPS || PPC || SPARC || XTENSA + default y if ARM || M68K || MIPS || PPC || XTENSA help Display information about the board that U-Boot is running on when U-Boot starts up. The board function checkboard() is called diff --git a/common/board_f.c b/common/board_f.c index 224ba09803..c4eb3ae65e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -364,20 +364,6 @@ static int setup_dest_addr(void) return 0; } -#if defined(CONFIG_SPARC) -static int reserve_prom(void) -{ - /* defined in arch/sparc/cpu/leon?/prom.c */ - extern void *__prom_start_reloc; - int size = 8192; /* page table = 2k, prom = 6k */ - gd->relocaddr -= size; - __prom_start_reloc = map_sysmem(gd->relocaddr + 2048, size - 2048); - debug("Reserving %dk for PROM and page table at %08lx\n", size, - gd->relocaddr); - return 0; -} -#endif - #if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR) static int reserve_logbuffer(void) { @@ -871,8 +857,7 @@ static const init_fnc_t init_sequence_f[] = { init_timebase, #endif #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \ - defined(CONFIG_NDS32) || defined(CONFIG_SH) || \ - defined(CONFIG_SPARC) + defined(CONFIG_NDS32) || defined(CONFIG_SH) timer_init, /* initialize timer */ #endif #if defined(CONFIG_BOARD_POSTCLK_INIT) @@ -964,9 +949,6 @@ static const init_fnc_t init_sequence_f[] = { /* Blackfin u-boot monitor should be on top of the ram */ reserve_uboot, #endif -#if defined(CONFIG_SPARC) - reserve_prom, -#endif #if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR) reserve_logbuffer, #endif diff --git a/common/board_r.c b/common/board_r.c index 3344913399..c8eeb9cbd4 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -49,9 +49,6 @@ #include <timer.h> #include <trace.h> #include <watchdog.h> -#ifdef CONFIG_CMD_AMBAPP -#include <ambapp.h> -#endif #ifdef CONFIG_ADDR_MAP #include <asm/mmu.h> #endif @@ -69,10 +66,6 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_SPARC) -extern int prom_init(void); -#endif - ulong monitor_flash_len; __weak int board_flash_wp_on(void) @@ -598,18 +591,6 @@ static int initr_status_led(void) } #endif -#if defined(CONFIG_CMD_AMBAPP) && defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP) -extern int do_ambapp_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); - -static int initr_ambapp_print(void) -{ - puts("AMBA:\n"); - do_ambapp_print(NULL, 0, 0, NULL); - - return 0; -} -#endif - #if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI) static int initr_scsi(void) { @@ -823,8 +804,7 @@ static init_fnc_t init_sequence_r[] = { initr_flash, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86) || \ - defined(CONFIG_SPARC) +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86) /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif @@ -895,12 +875,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_BOARD_LATE_INIT board_late_init, #endif -#if defined(CONFIG_CMD_AMBAPP) - ambapp_init_reloc, -#if defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP) - initr_ambapp_print, -#endif -#endif #if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI) INIT_FUNC_WATCHDOG_RESET initr_scsi, @@ -940,9 +914,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_PS2KBD initr_kbd, #endif -#if defined(CONFIG_SPARC) - prom_init, -#endif run_main_loop, }; |