tiny-printf: Support %i

[oweals/u-boot.git] / cmd / net.c

diff --git a/cmd/net.c b/cmd/net.c
index ae8eeb79b258edce441b031ad3e72f615adbb31d..1b724cc57090e7ab81eecf750c48157d1fa57ce8 100644 (file)
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -10,10 +9,13 @@
  */
 #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 []);
 
+#ifdef CONFIG_CMD_BOOTP
 static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common(BOOTP, cmdtp, argc, argv);
@@ -24,7 +26,9 @@ U_BOOT_CMD(
        "boot image via network using BOOTP/TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
+#endif
 
+#ifdef CONFIG_CMD_TFTPBOOT
 int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int ret;
@@ -40,6 +44,7 @@ U_BOOT_CMD(
        "boot image via network using TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
+#endif
 
 #ifdef CONFIG_CMD_TFTPPUT
 static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -180,13 +185,18 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
        int   size;
        ulong addr;
 
-       /* pre-set load_addr */
-       s = getenv("loadaddr");
+       net_boot_file_name_explicit = false;
+
+       /* pre-set image_load_addr */
+       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:
+               /* refresh bootfile name from env */
+               copy_filename(net_boot_file_name, env_get("bootfile"),
+                             sizeof(net_boot_file_name));
                break;
 
        case 2: /*
@@ -196,15 +206,21 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
                 * mis-interpreted as a valid number.
                 */
                addr = simple_strtoul(argv[1], &end, 16);
-               if (end == (argv[1] + strlen(argv[1])))
-                       load_addr = addr;
-               else
+               if (end == (argv[1] + strlen(argv[1]))) {
+                       image_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],
                                      sizeof(net_boot_file_name));
+               }
                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));
 
@@ -212,11 +228,12 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
 
 #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;
                }
+               net_boot_file_name_explicit = true;
                copy_filename(net_boot_file_name, argv[3],
                              sizeof(net_boot_file_name));
                break;
@@ -331,7 +348,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        char *toff;
 
        if (argc < 2) {
-               net_ntp_server = getenv_ip("ntpserverip");
+               net_ntp_server = env_get_ip("ntpserverip");
                if (net_ntp_server.s_addr == 0) {
                        printf("ntpserverip not set\n");
                        return CMD_RET_FAILURE;
@@ -344,7 +361,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
        }
 
-       toff = getenv("timeoffset");
+       toff = env_get("timeoffset");
        if (toff == NULL)
                net_ntp_time_offset = 0;
        else