diff options
author | Tom Rini <trini@konsulko.com> | 2025-04-07 12:35:13 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-04-07 16:35:43 -0600 |
commit | f892a7f397a66d8d09f418d1e0e06dfb48bac27d (patch) | |
tree | 0d4072f764ff512d90467e0217af91deb442dac0 /net/net.c | |
parent | 2015662a670ca69b5b6636f518c0dde9c229f92d (diff) |
Revert "Merge patch series "pxe: Precursor series for supporting read_all() in extlinux / PXE""
This reverts commit 8bc3542384e3a1219e5ffb62b79d16dddc1b1fb9, reversing
changes made to 698edd63eca090a2e299cd3facf90a0b97bed677.
There are still problems with this series to work out.
Link: https://lore.kernel.org/u-boot/CAFLszTjw_MJbK9tpzVYi3XKGazcv55auBAdgVzcAVUta7dRqcg@mail.gmail.com/
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'net/net.c')
-rw-r--r-- | net/net.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/net/net.c b/net/net.c index ef97377cdec..1828f1cca36 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) |