Browse Source

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>
imx_v2013.04_3.5.7_1.0.0_alpha
Marek Vasut 8 years ago
committed by Tom Rini
parent
commit
036036d79c
15 changed files with 3 additions and 42 deletions
  1. +0
    -2
      arch/arm/lib/board.c
  2. +0
    -2
      arch/blackfin/lib/board.c
  3. +0
    -2
      arch/m68k/lib/board.c
  4. +0
    -2
      arch/microblaze/lib/board.c
  5. +0
    -2
      arch/nds32/lib/board.c
  6. +0
    -2
      arch/powerpc/lib/board.c
  7. +0
    -2
      arch/sandbox/lib/board.c
  8. +0
    -2
      arch/x86/lib/board.c
  9. +0
    -2
      common/cmd_nvedit.c
  10. +2
    -4
      common/fdt_support.c
  11. +0
    -2
      common/iomux.c
  12. +0
    -2
      common/stdio.c
  13. +0
    -12
      include/common.h
  14. +1
    -1
      include/serial.h
  15. +0
    -3
      post/board/pdm360ng/coproc_com.c

+ 0
- 2
arch/arm/lib/board.c View File

@ -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);


+ 0
- 2
arch/blackfin/lib/board.c View File

@ -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");


+ 0
- 2
arch/m68k/lib/board.c View File

@ -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);


+ 0
- 2
arch/microblaze/lib/board.c View File

@ -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 ();


+ 0
- 2
arch/nds32/lib/board.c View File

@ -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);


+ 0
- 2
arch/powerpc/lib/board.c View File

@ -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);


+ 0
- 2
arch/sandbox/lib/board.c View File

@ -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();


+ 0
- 2
arch/x86/lib/board.c View File

@ -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


+ 0
- 2
common/cmd_nvedit.c View File

@ -239,10 +239,8 @@ int env_check_apply(const char *name, const char *oldval,
if (console_assign(console, newval) < 0)
return 1;
#ifdef CONFIG_SERIAL_MULTI
if (serial_assign(newval) < 0)
return 1;
#endif
#endif /* CONFIG_CONSOLE_MUX */
}


+ 2
- 4
common/fdt_support.c View File

@ -94,7 +94,7 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
#ifdef CONFIG_OF_STDOUT_VIA_ALIAS
#ifdef CONFIG_SERIAL_MULTI
#ifdef CONFIG_CONS_INDEX
static void fdt_fill_multisername(char *sername, size_t maxlen)
{
const char *outname = stdio_devices[stdout]->name;
@ -106,9 +106,7 @@ static void fdt_fill_multisername(char *sername, size_t maxlen)
if (strcmp(outname + 1, "serial") > 0)
strncpy(sername, outname + 1, maxlen);
}
#else
static inline void fdt_fill_multisername(char *sername, size_t maxlen) {}
#endif /* CONFIG_SERIAL_MULTI */
#endif
static int fdt_fixup_stdout(void *fdt, int chosenoff)
{


+ 0
- 2
common/iomux.c View File

@ -135,7 +135,6 @@ int iomux_doenv(const int console, const char *arg)
*/
if (console_assign(console, start[j]) < 0)
continue;
#ifdef CONFIG_SERIAL_MULTI
/*
* This was taken from common/cmd_nvedit.c.
* This will never work because serial_assign() returns
@ -146,7 +145,6 @@ int iomux_doenv(const int console, const char *arg)
*/
if (serial_assign(start[j]) < 0)
continue;
#endif
cons_set[cs_idx++] = dev;
}
free(console_args);


+ 0
- 2
common/stdio.c View File

@ -227,9 +227,7 @@ int stdio_init (void)
drv_logbuff_init ();
#endif
drv_system_init ();
#ifdef CONFIG_SERIAL_MULTI
serial_stdio_init ();
#endif
#ifdef CONFIG_USB_TTY
drv_usbtty_init ();
#endif


+ 0
- 12
include/common.h View File

@ -195,18 +195,6 @@ typedef void (interrupt_handler_t)(void *);
# endif
#endif
#ifndef CONFIG_SERIAL_MULTI
#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) \
|| defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \
|| defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
#define CONFIG_SERIAL_MULTI 1
#endif
#endif /* CONFIG_SERIAL_MULTI */
/*
* General Purpose Utilities
*/


+ 1
- 1
include/serial.h View File

@ -63,7 +63,7 @@ extern int usbtty_tstc(void);
#endif /* CONFIG_USB_TTY */
#if defined(CONFIG_MPC512X) && defined(CONFIG_SERIAL_MULTI)
#if defined(CONFIG_MPC512X)
extern struct stdio_dev *open_port(int num, int baudrate);
extern int close_port(int num);
extern int write_port(struct stdio_dev *port, char *buf);


+ 0
- 3
post/board/pdm360ng/coproc_com.c View File

@ -28,8 +28,6 @@
#include <post.h>
#include <serial.h>
#if defined(CONFIG_SERIAL_MULTI)
/*
* Actually the termination sequence of the coprocessor
* commands is "\r\n" (CR LF), but here we use a side effect of
@ -94,4 +92,3 @@ int coprocessor_post_test(int flags)
return 0;
}
#endif /* CONFIG_SERIAL_MULTI */

Loading…
Cancel
Save