From 036036d79c8535342594ab362143416d6a9bd11e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 14 Sep 2012 23:45:51 +0200 Subject: serial: Remove CONFIG_SERIAL_MULTI from remaining sources Remove the parts depending either on disabled CONFIG_SERIAL_MULTI or ifdefs around CONFIG_SERIAL_MULTI parts since CONFIG_SERIAL_MULTI is now enabled by default. Signed-off-by: Marek Vasut Cc: Marek Vasut Cc: Tom Rini Cc: Anatolij Gustschin Cc: Stefan Roese --- arch/arm/lib/board.c | 2 -- arch/blackfin/lib/board.c | 2 -- arch/m68k/lib/board.c | 2 -- arch/microblaze/lib/board.c | 2 -- arch/nds32/lib/board.c | 2 -- arch/powerpc/lib/board.c | 2 -- arch/sandbox/lib/board.c | 2 -- arch/x86/lib/board.c | 2 -- 8 files changed, 16 deletions(-) (limited to 'arch') diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 109a1ac7528..0b47ab341ed 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -492,9 +492,7 @@ void board_init_r(gd_t *id, ulong dest_addr) #ifdef CONFIG_CLOCKS set_cpu_clk_info(); /* Setup clock information */ #endif -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr); diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 6a9282c77b4..e47b606e876 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -284,9 +284,7 @@ void board_init_f(ulong bootflag) init_baudrate(); serial_early_puts("Serial init\n"); serial_init(); -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif serial_early_puts("Console init flash\n"); console_init_f(); serial_early_puts("End of early debugging\n"); diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index 2add630abb4..67c9a1382e3 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -401,9 +401,7 @@ void board_init_r (gd_t *id, ulong dest_addr) gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr); diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 674b5731966..efd63cd3412 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -108,9 +108,7 @@ void board_init_f(ulong not_used) */ mem_malloc_init (CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN); -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { WATCHDOG_RESET (); diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index 17d3ee071f1..89900fea435 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -324,9 +324,7 @@ void board_init_r(gd_t *id, ulong dest_addr) (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); #endif /* defined(CONFIG_NEEDS_MANUAL_RELOC) */ -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr); diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 07feaf55fc2..b860141efd6 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -672,9 +672,7 @@ void board_init_r(gd_t *id, ulong dest_addr) gd->env_addr += dest_addr - CONFIG_SYS_MONITOR_BASE; #endif -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr); diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c index c173bf96f02..83858c1ffe5 100644 --- a/arch/sandbox/lib/board.c +++ b/arch/sandbox/lib/board.c @@ -220,9 +220,7 @@ void board_init_r(gd_t *id, ulong dest_addr) gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif #ifdef CONFIG_POST post_output_backlog(); diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 90cf7fc8883..e5caf13561b 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -150,9 +150,7 @@ init_fnc_t *init_sequence_r[] = { timer_init, display_banner, display_dram_config, -#ifdef CONFIG_SERIAL_MULTI serial_initialize_r, -#endif #ifndef CONFIG_SYS_NO_FLASH flash_init_r, #endif -- cgit v1.2.3