diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nvedit.c | 2 | ||||
| -rw-r--r-- | common/fdt_support.c | 6 | ||||
| -rw-r--r-- | common/iomux.c | 2 | ||||
| -rw-r--r-- | common/stdio.c | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 772cffa..d655ab9 100644 --- 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 593f16c..963ea90 100644 --- 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 91d98e9..dbc2312 100644 --- 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 1bf9ba0..605ff3f 100644 --- 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 |