summaryrefslogtreecommitdiffstats
path: root/common/iomux.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 23:45:51 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:59 -0700
commit036036d79c8535342594ab362143416d6a9bd11e (patch)
tree8e874f63630bd44b349eea84b368088c0b70a433 /common/iomux.c
parenta3827250606895ec2dd4b8d867342b7cabf3692f (diff)
downloadtalos-obmc-uboot-036036d79c8535342594ab362143416d6a9bd11e.tar.gz
talos-obmc-uboot-036036d79c8535342594ab362143416d6a9bd11e.zip
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 'common/iomux.c')
-rw-r--r--common/iomux.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/common/iomux.c b/common/iomux.c
index 91d98e9835..dbc231250c 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);
OpenPOWER on IntegriCloud