Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / cmd / scsi.c

diff --git a/cmd/scsi.c b/cmd/scsi.c
index 7442e6a..8e36de1 100644 (file)
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -17,7 +17,7 @@ static int scsi_curr_dev; /* current device */
 /*
  * scsi boot command intepreter. Derived from diskboot
  */
-int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
        return common_diskboot(cmdtp, "scsi", argc, argv);
 }
@@ -25,7 +25,7 @@ int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 /*
  * scsi command intepreter
  */
-int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
        int ret;
 
@@ -36,8 +36,10 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        case 2:
                if (strncmp(argv[1], "res", 3) == 0) {
                        printf("\nReset SCSI\n");
-                       scsi_bus_reset();
-                       ret = scsi_scan(1);
+#ifndef CONFIG_DM_SCSI
+                       scsi_bus_reset(NULL);
+#endif
+                       ret = scsi_scan(true);
                        if (ret)
                                return CMD_RET_FAILURE;
                        return ret;
@@ -55,7 +57,7 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                        return 0;
                }
                if (strncmp(argv[1], "scan", 4) == 0) {
-                       ret = scsi_scan(1);
+                       ret = scsi_scan(true);
                        if (ret)
                                return CMD_RET_FAILURE;
                        return ret;