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 9e635c1172de0fa99a73c4c41ffb49449a681e8e..dbd08a06b2fab771577fe7d912e2524ba3b7bf3c 100644
(file)
--- a/
cmd/disk.c
+++ b/
cmd/disk.c
@@
-4,17
+4,20
@@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
#include <common.h>
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
#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>
-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[])
{
__maybe_unused int dev;
int part;
ulong addr = CONFIG_SYS_LOAD_ADDR;
ulong cnt;
char *const argv[])
{
__maybe_unused int dev;
int part;
ulong addr = CONFIG_SYS_LOAD_ADDR;
ulong cnt;
-
disk_partition_t
info;
+
struct disk_partition
info;
#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
image_header_t *hdr;
#endif
#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
image_header_t *hdr;
#endif
@@
-123,7
+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]);
}