Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

[oweals/u-boot.git] / cmd / disk.c

diff --git a/cmd/disk.c b/cmd/disk.c
index 106f2d1a3b50a17c562a64e334987f2096beacce..8060e753ebda7bec8d58c4c67c00e8578998cb26 100644 (file)
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -1,26 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
+#include <cpu_func.h>
+#include <image.h>
+#include <log.h>
 #include <part.h>
 
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_SCSI) || \
-       defined(CONFIG_USB_STORAGE)
-int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
+int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc,
                    char *const argv[])
 {
-       int dev, part;
+       __maybe_unused int dev;
+       int part;
        ulong addr = CONFIG_SYS_LOAD_ADDR;
        ulong cnt;
-       disk_partition_t info;
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+       struct disk_partition info;
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        image_header_t *hdr;
 #endif
-       block_dev_desc_t *dev_desc;
+       struct blk_desc *dev_desc;
 
 #if CONFIG_IS_ENABLED(FIT)
        const void *fit_hdr = NULL;
@@ -38,14 +40,14 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
 
        bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
 
-       part = get_device_and_partition(intf, (argc == 3) ? argv[2] : NULL,
+       part = blk_get_device_part_str(intf, (argc == 3) ? argv[2] : NULL,
                                        &dev_desc, &info, 1);
        if (part < 0) {
                bootstage_error(BOOTSTAGE_ID_IDE_TYPE);
                return 1;
        }
 
-       dev = dev_desc->dev;
+       dev = dev_desc->devnum;
        bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
 
        printf("\nLoading from %s device %d, partition %d: "
@@ -56,7 +58,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
              ", Block Size: %ld\n",
              info.start, info.size, info.blksz);
 
-       if (dev_desc->block_read(dev_desc, info.start, 1, (ulong *)addr) != 1) {
+       if (blk_dread(dev_desc, info.start, 1, (ulong *)addr) != 1) {
                printf("** Read error on %d:%d\n", dev, part);
                bootstage_error(BOOTSTAGE_ID_IDE_PART_READ);
                return 1;
@@ -64,7 +66,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
        bootstage_mark(BOOTSTAGE_ID_IDE_PART_READ);
 
        switch (genimg_get_format((void *) addr)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        case IMAGE_FORMAT_LEGACY:
                hdr = (image_header_t *) addr;
 
@@ -100,8 +102,8 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
        cnt /= info.blksz;
        cnt -= 1;
 
-       if (dev_desc->block_read(dev_desc, info.start + 1, cnt,
-                                (ulong *)(addr + info.blksz)) != cnt) {
+       if (blk_dread(dev_desc, info.start + 1, cnt,
+                     (ulong *)(addr + info.blksz)) != cnt) {
                printf("** Read error on %d:%d\n", dev, part);
                bootstage_error(BOOTSTAGE_ID_IDE_READ);
                return 1;
@@ -125,8 +127,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
        flush_cache(addr, (cnt+1)*info.blksz);
 
        /* Loading ok, update default load address */
-       load_addr = addr;
+       image_load_addr = addr;
 
        return bootm_maybe_autostart(cmdtp, argv[0]);
 }
-#endif