diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-20 12:23:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-20 12:23:33 -0500 |
| commit | c7819d409ab7671991bf906482b7adcc21266f75 (patch) | |
| tree | eab7a9eba205f31dd1f4b606ec58d64ec5e933f1 /cmd/disk.c | |
| parent | c8a1198665b81113535e89c791a7991abe481d62 (diff) | |
| parent | addc376318d765902027021d88f693e95d1e1bcd (diff) | |
Merge branch '2020-01-17-reduce-size-of-common-h-even-more'
- Bring in Simon Glass's series that reduces what we have in <common.h>
even more.
Diffstat (limited to 'cmd/disk.c')
| -rw-r--r-- | cmd/disk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/disk.c b/cmd/disk.c index 437c175374..15973b7d13 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> #include <cpu_func.h> +#include <image.h> #include <part.h> int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, @@ -124,7 +125,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 */ - load_addr = addr; + image_load_addr = addr; return bootm_maybe_autostart(cmdtp, argv[0]); } |