summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAllen Martin <amartin@nvidia.com>2012-10-25 13:30:14 +0000
committerTom Rini <trini@ti.com>2012-10-26 09:32:58 -0700
commit8440f18a4818d52ba51bb9f0b07ce6439f1b6a57 (patch)
tree37d8061638131b2fdb7d1b7dee5274b6d0c7c446 /common
parent5e8f98319d8582d6a066610b5f1ec9b1a3f79704 (diff)
downloadu-boot-imx-8440f18a4818d52ba51bb9f0b07ce6439f1b6a57.zip
u-boot-imx-8440f18a4818d52ba51bb9f0b07ce6439f1b6a57.tar.gz
u-boot-imx-8440f18a4818d52ba51bb9f0b07ce6439f1b6a57.tar.bz2
serial: remove calls to serial_assign()
Remove calls to serial_assign() that are failing now that it returns a proper error code. This calls were not actually doing anything because they passed the name of a stdio_dev when a serial_device name is exptectd. Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_nvedit.c3
-rw-r--r--common/iomux.c10
2 files changed, 0 insertions, 13 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 1f9c674..68c38f4 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -238,9 +238,6 @@ int env_check_apply(const char *name, const char *oldval,
/* Try assigning specified device */
if (console_assign(console, newval) < 0)
return 1;
-
- if (serial_assign(newval) < 0)
- return 1;
#endif /* CONFIG_CONSOLE_MUX */
}
diff --git a/common/iomux.c b/common/iomux.c
index dbc2312..6a75704 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -135,16 +135,6 @@ int iomux_doenv(const int console, const char *arg)
*/
if (console_assign(console, start[j]) < 0)
continue;
- /*
- * This was taken from common/cmd_nvedit.c.
- * This will never work because serial_assign() returns
- * 1 upon error, not -1.
- * This would almost always return an error anyway because
- * serial_assign() expects the name of a serial device, like
- * serial_smc, but the user generally only wants to set serial.
- */
- if (serial_assign(start[j]) < 0)
- continue;
cons_set[cs_idx++] = dev;
}
free(console_args);