Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / mach-uniphier / mmc-first-dev.c

diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c
index 8c45229a8953f77459cba4cf58111b135eba3365..e2f4f4eb5c7af5760fbfa0b5ac2bf79b74ae1069 100644 (file)
--- a/arch/arm/mach-uniphier/mmc-first-dev.c
+++ b/arch/arm/mach-uniphier/mmc-first-dev.c
@@ -1,21 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <env.h>
 #include <mmc.h>
 #include <linux/errno.h>
 
-static int find_first_mmc_device(void)
+static int find_first_mmc_device(bool is_sd)
 {
        struct mmc *mmc;
        int i;
 
        for (i = 0; (mmc = find_mmc_device(i)); i++) {
-               if (!mmc_init(mmc) && IS_MMC(mmc))
+               if (!mmc_init(mmc) &&
+                   ((is_sd && IS_SD(mmc)) || (!is_sd && IS_MMC(mmc))))
                        return i;
        }
 
@@ -24,18 +25,18 @@ static int find_first_mmc_device(void)
 
 int mmc_get_env_dev(void)
 {
-       return find_first_mmc_device();
+       return find_first_mmc_device(false);
 }
 
 static int do_mmcsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int dev;
 
-       dev = find_first_mmc_device();
+       dev = find_first_mmc_device(false);
        if (dev < 0)
                return CMD_RET_FAILURE;
 
-       setenv_ulong("mmc_first_dev", dev);
+       env_set_ulong("mmc_first_dev", dev);
        return CMD_RET_SUCCESS;
 }
 
@@ -44,3 +45,21 @@ U_BOOT_CMD(
        "Set the first MMC (not SD) dev number to \"mmc_first_dev\" environment",
        ""
 );
+
+static int do_sdsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       int dev;
+
+       dev = find_first_mmc_device(true);
+       if (dev < 0)
+               return CMD_RET_FAILURE;
+
+       env_set_ulong("sd_first_dev", dev);
+       return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(
+       sdsetn, 1,      1,      do_sdsetn,
+       "Set the first SD dev number to \"sd_first_dev\" environment",
+       ""
+);