Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-04-04 14:56:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: Let networking support depend on NETDEVICES

Browse source 
CONFIG_NET does not imply that there are actually network devices
available, only CONFIG_NETDEVICES does. Changing to this dependency
obsoletes the check in Kconfig because NETDEVICES means DM_ETH.

Fixes: 0efe1bcf5c ("efi_loader: Add network access support")
Suggested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Jan Kiszka 2022-10-14 18:10:06 +02:00 • committed by Heinrich Schuchardt
parent 607566d010
commit 77b5c4a5b1
6 changed files with 9 additions and 8 deletions

1
lib/efi_loader/Kconfig
View file

@ -11,7 +11,6 @@ config EFI_LOADER
# We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB
depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT
depends on BLK depends on BLK
depends on DM_ETH || !NET
depends on !EFI_APP depends on !EFI_APP
default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
select CHARSET select CHARSET

2
lib/efi_loader/Makefile
View file

@ -68,7 +68,7 @@ obj-y += efi_watchdog.o
obj-$(CONFIG_EFI_ESRT) += efi_esrt.o obj-$(CONFIG_EFI_ESRT) += efi_esrt.o
obj-$(CONFIG_VIDEO) += efi_gop.o obj-$(CONFIG_VIDEO) += efi_gop.o
obj-$(CONFIG_BLK) += efi_disk.o obj-$(CONFIG_BLK) += efi_disk.o
obj-$(CONFIG_NET) += efi_net.o obj-$(CONFIG_NETDEVICES) += efi_net.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += efi_acpi.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += efi_acpi.o
obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o
obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_rng.o obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_rng.o

6
lib/efi_loader/efi_device_path.c
View file

@ -613,7 +613,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev)
*vdp = ROOT; *vdp = ROOT;
return &vdp[1]; return &vdp[1];
} }
#ifdef CONFIG_NET #ifdef CONFIG_NETDEVICES
case UCLASS_ETH: { case UCLASS_ETH: {
struct efi_device_path_mac_addr *dp = struct efi_device_path_mac_addr *dp =
dp_fill(buf, dev->parent); dp_fill(buf, dev->parent);
@ -1052,7 +1052,7 @@ struct efi_device_path *efi_dp_from_uart(void)
return buf; return buf;
} }
#ifdef CONFIG_NET #ifdef CONFIG_NETDEVICES
struct efi_device_path *efi_dp_from_eth(void) struct efi_device_path *efi_dp_from_eth(void)
{ {
void *buf, *start; void *buf, *start;
@ -1169,7 +1169,7 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
if (!strcmp(dev, "Net")) { if (!strcmp(dev, "Net")) {
#ifdef CONFIG_NET #ifdef CONFIG_NETDEVICES
if (device) if (device)
*device = efi_dp_from_eth(); *device = efi_dp_from_eth();
#endif #endif

2
lib/efi_loader/efi_setup.c
View file

@ -331,7 +331,7 @@ efi_status_t efi_init_obj_list(void)
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto out; goto out;
} }
#ifdef CONFIG_NET #ifdef CONFIG_NETDEVICES
ret = efi_net_register(); ret = efi_net_register();
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto out; goto out;

2
lib/efi_selftest/Makefile
View file

@ -50,7 +50,7 @@ efi_selftest_variables_runtime.o \
efi_selftest_watchdog.o efi_selftest_watchdog.o
obj-$(CONFIG_EFI_ECPT) += efi_selftest_ecpt.o obj-$(CONFIG_EFI_ECPT) += efi_selftest_ecpt.o
obj-$(CONFIG_NET) += efi_selftest_snp.o obj-$(CONFIG_NETDEVICES) += efi_selftest_snp.o
obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_selftest_devicepath.o obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_selftest_devicepath.o
obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += \ obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += \

2
net/bootp.c
View file

@ -1077,6 +1077,8 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0) { strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0) {
#endif /* CONFIG_SYS_BOOTFILE_PREFIX */ #endif /* CONFIG_SYS_BOOTFILE_PREFIX */
dhcp_packet_process_options(bp); dhcp_packet_process_options(bp);
if (CONFIG_IS_ENABLED(EFI_LOADER) &&
CONFIG_IS_ENABLED(NET_DEVICES))
efi_net_set_dhcp_ack(pkt, len); efi_net_set_dhcp_ack(pkt, len);
#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) #if defined(CONFIG_SERVERIP_FROM_PROXYDHCP)