projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 92de3af8a5c0d6f5274f6923025c7559ec41f3b4..9e635c1172de0fa99a73c4c41ffb49449a681e8e 100644
(file)
--- a/
cmd/disk.c
+++ b/
cmd/disk.c
@@
-1,15
+1,12
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000-2011
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (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>
*/
#include <common.h>
#include <command.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[])
{
int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
char *const argv[])
{
@@
-18,7
+15,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;
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;
image_header_t *hdr;
#endif
struct blk_desc *dev_desc;
@@
-65,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)) {
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;
case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *) addr;
@@
-130,4
+127,3
@@
int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
return bootm_maybe_autostart(cmdtp, argv[0]);
}
return bootm_maybe_autostart(cmdtp, argv[0]);
}
-#endif