mmc: avoid division by zero in meson_mmc_config_clock

[u-boot] / cmd / net.c

diff --git a/cmd/net.c b/cmd/net.c
index ae8eeb79b258edce441b031ad3e72f615adbb31d..67888d4e184add6a53531ff17ff758cfad41869b 100644 (file)
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -14,6 +14,7 @@
 
 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 +25,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 +43,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[])
@@ -181,7 +185,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
        ulong addr;
 
        /* pre-set load_addr */
-       s = getenv("loadaddr");
+       s = env_get("loadaddr");
        if (s != NULL)
                load_addr = simple_strtoul(s, NULL, 16);
 
@@ -331,7 +335,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 +348,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