include/ata.h: remove invalid links

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

diff --git a/cmd/disk.c b/cmd/disk.c
index 92de3af8a5c0d6f5274f6923025c7559ec41f3b4..15973b7d132e19ee1e07621001057b8547156564 100644 (file)
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -1,15 +1,14 @@
+// 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 <command.h>
+#include <cpu_func.h>
+#include <image.h>
 #include <part.h>
 
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_SCSI) || \
-       defined(CONFIG_USB_STORAGE)
 int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
                    char *const argv[])
 {
@@ -18,7 +17,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
        ulong addr = CONFIG_SYS_LOAD_ADDR;
        ulong cnt;
        disk_partition_t info;
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        image_header_t *hdr;
 #endif
        struct blk_desc *dev_desc;
@@ -65,7 +64,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;
 
@@ -126,8 +125,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