Allen,
-----Original Message----- From: Allen Martin [mailto:amartin@nvidia.com] Sent: Thursday, October 25, 2012 4:30 PM To: Tom Warren; swarren@wwwdotorg.org; marex@denx.de; trini@ti.com; joe.hershberger@ni.com; sjg@google.com Cc: u-boot@lists.denx.de; Allen Martin Subject: [PATCH] serial: remove calls to serial_assign()
I've applied this to u-boot-tegra/next to get it to boot fully. I'll remove it once it's in arm/master and/or before my next pull request to Albert.
Tom
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
common/cmd_nvedit.c | 3 --- common/iomux.c | 10 ---------- 2 files changed, 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;-- 1.7.10.4