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 'ti-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git]
/
cmd
/
bootm.c
diff --git
a/cmd/bootm.c
b/cmd/bootm.c
index 62ee7c4b8a169bb202483109c5a9fbf78f1277af..931d53f0c7209c77f4d35ac16c03f86dc75fe72b 100644
(file)
--- a/
cmd/bootm.c
+++ b/
cmd/bootm.c
@@
-144,7
+144,8
@@
int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd)
char *local_args[2];
local_args[0] = (char *)cmd;
local_args[1] = NULL;
char *local_args[2];
local_args[0] = (char *)cmd;
local_args[1] = NULL;
- printf("Automatic boot of image at addr 0x%08lX ...\n", load_addr);
+ printf("Automatic boot of image at addr 0x%08lX ...\n",
+ image_load_addr);
return do_bootm(cmdtp, 0, 1, local_args);
}
return do_bootm(cmdtp, 0, 1, local_args);
}
@@
-232,7
+233,7
@@
static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int rcode = 0;
if (argc < 2) {
int rcode = 0;
if (argc < 2) {
- return image_info(load_addr);
+ return image_info(
image_
load_addr);
}
for (arg = 1; arg < argc; ++arg) {
}
for (arg = 1; arg < argc; ++arg) {