projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command: Remove the cmd_tbl_t typedef
[oweals/u-boot.git]
/
cmd
/
disk.c
diff --git
a/cmd/disk.c
b/cmd/disk.c
index 3025225c764264a899d2ecd40e4081ccbc713228..dbd08a06b2fab771577fe7d912e2524ba3b7bf3c 100644
(file)
--- a/
cmd/disk.c
+++ b/
cmd/disk.c
@@
-1,28
+1,29
@@
+// 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 <part.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[])
{
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
image_header_t *hdr;
#endif
-
block_dev_desc_t
*dev_desc;
+
struct blk_desc
*dev_desc;
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
const void *fit_hdr = NULL;
#endif
const void *fit_hdr = NULL;
#endif
@@
-38,14
+39,14
@@
int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
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_desc, &info, 1);
if (part < 0) {
bootstage_error(BOOTSTAGE_ID_IDE_TYPE);
return 1;
}
- dev = dev_desc->dev;
+ dev = dev_desc->dev
num
;
bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
printf("\nLoading from %s device %d, partition %d: "
bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
printf("\nLoading from %s device %d, partition %d: "
@@
-56,7
+57,7
@@
int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
", Block Size: %ld\n",
info.start, info.size, info.blksz);
", 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_d
read(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;
printf("** Read error on %d:%d\n", dev, part);
bootstage_error(BOOTSTAGE_ID_IDE_PART_READ);
return 1;
@@
-64,7
+65,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;
@@
-82,7
+83,7
@@
int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
cnt = image_get_image_size(hdr);
break;
#endif
cnt = image_get_image_size(hdr);
break;
#endif
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
case IMAGE_FORMAT_FIT:
fit_hdr = (const void *) addr;
puts("Fit image detected...\n");
case IMAGE_FORMAT_FIT:
fit_hdr = (const void *) addr;
puts("Fit image detected...\n");
@@
-100,15
+101,15
@@
int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
cnt /= info.blksz;
cnt -= 1;
cnt /= info.blksz;
cnt -= 1;
- if (
dev_desc->block_
read(dev_desc, info.start + 1, cnt,
-
(ulong *)(addr + info.blksz)) != cnt) {
+ if (
blk_d
read(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;
}
bootstage_mark(BOOTSTAGE_ID_IDE_READ);
printf("** Read error on %d:%d\n", dev, part);
bootstage_error(BOOTSTAGE_ID_IDE_READ);
return 1;
}
bootstage_mark(BOOTSTAGE_ID_IDE_READ);
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
/* This cannot be done earlier,
* we need complete FIT image in RAM first */
if (genimg_get_format((void *) addr) == IMAGE_FORMAT_FIT) {
/* This cannot be done earlier,
* we need complete FIT image in RAM first */
if (genimg_get_format((void *) addr) == IMAGE_FORMAT_FIT) {
@@
-125,8
+126,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