Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig

[people/ms/u-boot.git] / common / iomux.c

diff --git a/common/iomux.c b/common/iomux.c
index bdcc853ff07bc70a71bcfa776d0974f85cb8bf2b..0e4e6803e7a832fe0ced120beb8d665ab3969762 100644 (file)
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -2,34 +2,19 @@
  * (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>
+#include <console.h>
 #include <serial.h>
 #include <malloc.h>
 
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
 void iomux_printdevs(const int console)
 {
        int i;
-       device_t *dev;
+       struct stdio_dev *dev;
 
        for (i = 0; i < cd_count[console]; i++) {
                dev = console_devices[console][i];
@@ -43,8 +28,8 @@ int iomux_doenv(const int console, const char *arg)
 {
        char *console_args, *temp, **start;
        int i, j, k, io_flag, cs_idx, repeat;
-       device_t *dev;
-       device_t **cons_set;
+       struct stdio_dev *dev;
+       struct stdio_dev **cons_set;
 
        console_args = strdup(arg);
        if (console_args == NULL)
@@ -85,7 +70,7 @@ int iomux_doenv(const int console, const char *arg)
                *temp = '\0';
                start[i] = temp + 1;
        }
-       cons_set = (device_t **)calloc(i, sizeof(device_t *));
+       cons_set = (struct stdio_dev **)calloc(i, sizeof(struct stdio_dev *));
        if (cons_set == NULL) {
                free(start);
                free(console_args);
@@ -135,18 +120,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);
@@ -158,18 +131,18 @@ int iomux_doenv(const int console, const char *arg)
        } else {
                /* Works even if console_devices[console] is NULL. */
                console_devices[console] =
-                       (device_t **)realloc(console_devices[console],
-                       cs_idx * sizeof(device_t *));
+                       (struct stdio_dev **)realloc(console_devices[console],
+                       cs_idx * sizeof(struct stdio_dev *));
                if (console_devices[console] == NULL) {
                        free(cons_set);
                        return 1;
                }
                memcpy(console_devices[console], cons_set, cs_idx *
-                       sizeof(device_t *));
+                       sizeof(struct stdio_dev *));
 
                cd_count[console] = cs_idx;
        }
        free(cons_set);
        return 0;
 }
-#endif /* CONFIG_CONSOLE_MUX */
+#endif /* CONSOLE_MUX */