X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fiomux.c;h=62bdec61aaf79deb9c6477dab015b7fb3e9b6392;hb=e5a504eb3d8cbc33199dac61a07d16ddd3c1c7f9;hp=91d98e98358ca3dee517d96c507fa43adb8206dc;hpb=a694610d3361465d4c8d27dde72ab8b63d31115e;p=u-boot

diff --git a/common/iomux.c b/common/iomux.c
index 91d98e9835..62bdec61aa 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2008
  * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -135,18 +119,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
-		 * 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;
-#endif
 		cons_set[cs_idx++] = dev;
 	}
 	free(console_args);