diff options
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/net/net.c b/net/net.c index ef97377cdec..5219367e391 100644 --- a/net/net.c +++ b/net/net.c @@ -775,50 +775,6 @@ done: return ret; } -int netboot_run_(enum proto_t proto, ulong addr, const char *fname, ulong size, - bool fname_explicit, bool ipv6) -{ - int ret; - - bootstage_mark(BOOTSTAGE_ID_NET_START); - - /* - * For now we use the global variables as that is the only way to - * control the network stack. At some point, perhaps, the state could be - * in a struct - */ - if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) - image_save_addr = addr; - else - image_load_addr = addr; - - net_boot_file_name_explicit = fname_explicit; - copy_filename(net_boot_file_name, fname, sizeof(net_boot_file_name)); - if (IS_ENABLED(CONFIG_IPV6)) - use_ip6 = ipv6; - if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) { - image_save_addr = addr; - image_save_size = size; - } else { - image_load_addr = addr; - } - - ret = net_loop(proto); - if (ret < 0) { - bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK); - return ret; - } - bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK); - - return 0; -} - -int netboot_run(enum proto_t proto, ulong addr, const char *fname, ulong size, - bool ipv6) -{ - return netboot_run_(proto, addr, fname, size, true, ipv6); -} - /**********************************************************************/ static void start_again_timeout_handler(void) @@ -1603,7 +1559,7 @@ common: puts("*** ERROR: `ipaddr' not set\n"); return 1; } - /* Fall through */ + fallthrough; #ifdef CONFIG_CMD_RARP case RARP: |