diff options
author | Tom Rini <trini@konsulko.com> | 2018-07-26 15:55:42 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-07-26 15:55:42 -0400 |
commit | a57d45db90c8de2959b4484cc8f6ba81219a2269 (patch) | |
tree | 0f4bb63c28f89aea45db67d82bf53de87d930e44 /cmd | |
parent | 2547e91dc15e5203e15d4ebde9172174743b14a7 (diff) | |
parent | 26026e695afa794ac018a09e79a48120d322b60d (diff) | |
download | u-boot-a57d45db90c8de2959b4484cc8f6ba81219a2269.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/net.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -192,6 +192,9 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, switch (argc) { case 1: + /* refresh bootfile name from env */ + copy_filename(net_boot_file_name, env_get("bootfile"), + sizeof(net_boot_file_name)); break; case 2: /* @@ -203,6 +206,9 @@ 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]))) { load_addr = addr; + /* refresh bootfile name from env */ + copy_filename(net_boot_file_name, env_get("bootfile"), + sizeof(net_boot_file_name)); } else { net_boot_file_name_explicit = true; copy_filename(net_boot_file_name, argv[1], |