configs: dra7xx_evm: Add Kconfigs for SPL_DFU bootmode

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

diff --git a/cmd/disk.c b/cmd/disk.c
index 2fd1717e6a44680107f2c242ab29855a9baaad41..9e635c1172de0fa99a73c4c41ffb49449a681e8e 100644 (file)
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -1,23 +1,21 @@
+// 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 <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,
                    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)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        image_header_t *hdr;
 #endif
        struct blk_desc *dev_desc;
@@ -64,7 +62,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;
 
@@ -129,4 +127,3 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
 
        return bootm_maybe_autostart(cmdtp, argv[0]);
 }
-#endif