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>

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 109a1ac75281aa2effb9bd17bd3fa63f26a0c147..0b47ab341edf41eb8b82a96b416f31efbb7c098e 100644 (file)
--- 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 6a9282c77b4ca7717e7dac79677250f7c4d673af..e47b606e8768f7d2478847720cc977b51bc72ba9 100644 (file)
--- 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 2add630abb463c6531268b2c75f6d3700bb29a4f..67c9a1382e30160f7278c9ec89df005fd10eff56 100644 (file)
--- 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 674b573196633b417b97f56bfc51589f58480081..efd63cd341213de1c81865cb6994b64367af5916 100644 (file)
--- 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 17d3ee071f1f09fbd61b8036e7f3023eb66f4214..89900fea4359c960523321d2be6c863cf3b27258 100644 (file)
--- 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 07feaf55fc2290f56fa628e48a6a791eed22894f..b860141efd68c16d5e045f77127b978815d94987 100644 (file)
--- 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 c173bf96f025f9153029776b5097ab989212eba4..83858c1ffe5ca7c738fc6fe79fd95958910fcdb9 100644 (file)
--- 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 90cf7fc8883c2ee02a0b22361b69a1905f214b4b..e5caf13561b1585cfd36842c15aa0e9156d583c4 100644 (file)
--- 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

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 772cffa8a20dbae2ff0541b8b33ce45fe82810b4..d655ab9684eef9389c798cbc199a451a484e7189 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -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 */
        }
 

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 593f16c1620138b306ea76b1e15c7612061d0b2b..963ea90234699c29ad19eb0d8f855513a70539b0 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -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)
 {

diff --git a/common/iomux.c b/common/iomux.c
index 91d98e98358ca3dee517d96c507fa43adb8206dc..dbc231250c3f7ad641ed179cb66e0ffabf61f6db 100644 (file)
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -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);

diff --git a/common/stdio.c b/common/stdio.c
index 1bf9ba082978c074d2b5b6baf21827e1484a6449..605ff3fde3ea30e1f631043ea5003557360689c0 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -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

diff --git a/include/common.h b/include/common.h
index 7d9ab1540b6e22f2b0bd7841fa2c4c27d4a5af9c..7205677b8db76971ddf1c0a0e45788fcefc3b068 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -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
  */

diff --git a/include/serial.h b/include/serial.h
index 01a86b44dd98f36e66d9261712c2674b318fc45b..a8d23f519dd2e10c7f90038a556143aac93510da 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -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);

diff --git a/post/board/pdm360ng/coproc_com.c b/post/board/pdm360ng/coproc_com.c
index 075535213bc82ac1923c2933d324f7ee3579ebe2..b7e02b573626d94202c67ff9bd4ed22302b8badf 100644 (file)
--- a/post/board/pdm360ng/coproc_com.c
+++ b/post/board/pdm360ng/coproc_com.c
@@ -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 */