diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-14 23:45:51 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:59 -0700 |
| commit | 036036d79c8535342594ab362143416d6a9bd11e (patch) | |
| tree | 8e874f63630bd44b349eea84b368088c0b70a433 /arch | |
| parent | a3827250606895ec2dd4b8d867342b7cabf3692f (diff) | |
| download | u-boot-imx-036036d79c8535342594ab362143416d6a9bd11e.zip u-boot-imx-036036d79c8535342594ab362143416d6a9bd11e.tar.gz u-boot-imx-036036d79c8535342594ab362143416d6a9bd11e.tar.bz2 | |
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 <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/m68k/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/nds32/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/sandbox/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/x86/lib/board.c | 2 |
8 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 109a1ac..0b47ab3 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 6a9282c..e47b606 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 2add630..67c9a13 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 674b573..efd63cd 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 17d3ee0..89900fe 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 07feaf5..b860141 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 c173bf9..83858c1 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 90cf7fc..e5caf13 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 |