projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[oweals/u-boot.git]
/
cmd
/
disk.c
diff --git
a/cmd/disk.c
b/cmd/disk.c
index fcc412312719b755eef21e780345b80932175127..8060e753ebda7bec8d58c4c67c00e8578998cb26 100644
(file)
--- a/
cmd/disk.c
+++ b/
cmd/disk.c
@@
-1,23
+1,25
@@
+// 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 <common.h>
+#include <bootstage.h>
#include <command.h>
#include <command.h>
+#include <cpu_func.h>
+#include <image.h>
+#include <log.h>
#include <part.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,
+int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc,
char *const argv[])
{
char *const argv[])
{
- int dev, part;
+ __maybe_unused int dev;
+ int part;
ulong addr = CONFIG_SYS_LOAD_ADDR;
ulong cnt;
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
struct blk_desc *dev_desc;
image_header_t *hdr;
#endif
struct blk_desc *dev_desc;
@@
-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)) {
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;
@@
-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 */
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]);
}
return bootm_maybe_autostart(cmdtp, argv[0]);
}
-#endif