eef0d75174
This function requires access to env.h but it is a lot to include just for the env_get() function. It eventually pulls in linux/byteorder which causes a conflict with exfat which has its own byteorder functions. Move the function to a C file instead. Add includes to some other files to keep the build working. Series-to: u-boot Series-cc: trini Series-cc: Jerome Forissier <jerome.forissier@linaro.org> Series-version: 2 Cover-changes: 2 - Add patches for other files exposed by this change Cover-letter: Deal with exfat versus byteorder Since exfat has its own byteorder functions we need to be careful about including the normal U-Boot byteorder headers in code included by exfat. One chain for include/linux/byteorder/little_endian.h is like this: In file included from arch/sandbox/include/asm/byteorder.h:19, from arch/sandbox/include/asm/byteorder.h:19, from include/compiler.h:132, from include/env.h:12, from include/command.h:13, from include/net-common.h:7, from include/net.h:6, from include/efi.h:23, from include/blk.h:12, from include/part.h:9, from include/fs_internal.h:11, from fs/exfat/io.c:52: This series tidies things up so that efi.h can include net.h as required. END Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
34 lines
665 B
C
34 lines
665 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <env.h>
|
|
#include <net-common.h>
|
|
|
|
void copy_filename(char *dst, const char *src, int size)
|
|
{
|
|
if (src && *src && (*src == '"')) {
|
|
++src;
|
|
--size;
|
|
}
|
|
|
|
while ((--size > 0) && src && *src && (*src != '"'))
|
|
*dst++ = *src++;
|
|
*dst = '\0';
|
|
}
|
|
|
|
struct wget_http_info default_wget_info = {
|
|
.method = WGET_HTTP_METHOD_GET,
|
|
.set_bootdev = true,
|
|
};
|
|
|
|
struct wget_http_info *wget_info;
|
|
|
|
int wget_request(ulong dst_addr, char *uri, struct wget_http_info *info)
|
|
{
|
|
wget_info = info ? info : &default_wget_info;
|
|
return wget_with_dns(dst_addr, uri);
|
|
}
|
|
|
|
struct in_addr env_get_ip(char *var)
|
|
{
|
|
return string_to_ip(env_get(var));
|
|
}
|