projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tiny-printf: Support %i
[oweals/u-boot.git]
/
cmd
/
net.c
diff --git
a/cmd/net.c
b/cmd/net.c
index 89721b8f8be9aa4f26c3485558440e1311f9737f..1b724cc57090e7ab81eecf750c48157d1fa57ce8 100644
(file)
--- a/
cmd/net.c
+++ b/
cmd/net.c
@@
-9,6
+9,8
@@
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
+#include <image.h>
#include <net.h>
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
#include <net.h>
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
@@
-185,10
+187,10
@@
static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
net_boot_file_name_explicit = false;
net_boot_file_name_explicit = false;
- /* pre-set load_addr */
+ /* pre-set
image_
load_addr */
s = env_get("loadaddr");
if (s != NULL)
s = env_get("loadaddr");
if (s != NULL)
- load_addr = simple_strtoul(s, NULL, 16);
+
image_
load_addr = simple_strtoul(s, NULL, 16);
switch (argc) {
case 1:
switch (argc) {
case 1:
@@
-205,7
+207,7
@@
static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
*/
addr = simple_strtoul(argv[1], &end, 16);
if (end == (argv[1] + strlen(argv[1]))) {
*/
addr = simple_strtoul(argv[1], &end, 16);
if (end == (argv[1] + strlen(argv[1]))) {
- load_addr = addr;
+
image_
load_addr = addr;
/* refresh bootfile name from env */
copy_filename(net_boot_file_name, env_get("bootfile"),
sizeof(net_boot_file_name));
/* refresh bootfile name from env */
copy_filename(net_boot_file_name, env_get("bootfile"),
sizeof(net_boot_file_name));
@@
-217,7
+219,7
@@
static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
break;
case 3:
break;
case 3:
- load_addr = simple_strtoul(argv[1], NULL, 16);
+
image_
load_addr = simple_strtoul(argv[1], NULL, 16);
net_boot_file_name_explicit = true;
copy_filename(net_boot_file_name, argv[2],
sizeof(net_boot_file_name));
net_boot_file_name_explicit = true;
copy_filename(net_boot_file_name, argv[2],
sizeof(net_boot_file_name));
@@
-226,8
+228,8
@@
static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
#ifdef CONFIG_CMD_TFTPPUT
case 4:
#ifdef CONFIG_CMD_TFTPPUT
case 4:
- if (strict_strtoul(argv[1], 16, &save_addr) < 0 ||
- strict_strtoul(argv[2], 16, &save_size) < 0) {
+ if (strict_strtoul(argv[1], 16, &
image_
save_addr) < 0 ||
+ strict_strtoul(argv[2], 16, &
image_
save_size) < 0) {
printf("Invalid address/size\n");
return CMD_RET_USAGE;
}
printf("Invalid address/size\n");
return CMD_RET_USAGE;
}