Browse Source

Revert "Kconfig: cmd: Make networking command dependent on NET"

This reverts the parts of commit 3b3ea2c56e
where it changed the EFI dependency on NET.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Reviewed-by: Duncan Hare <dh@synoia.com>
tags/2020-06-01
Joe Hershberger 3 years ago
parent
commit
092f2f35b5
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      Kconfig
  2. +2
    -2
      cmd/bootefi.c
  3. +1
    -1
      lib/efi_loader/Makefile
  4. +1
    -1
      lib/efi_loader/efi_device_path.c

+ 1
- 1
Kconfig View File

@@ -71,7 +71,7 @@ config DISTRO_DEFAULTS
select CMD_BOOTI if ARM64
select CMD_DHCP if CMD_NET
select CMD_PING if CMD_NET
select CMD_PXE if NET && CMD_NET
select CMD_PXE if NET
select CMD_EXT2
select CMD_EXT4
select CMD_FAT


+ 2
- 2
cmd/bootefi.c View File

@@ -56,7 +56,7 @@ efi_status_t efi_init_obj_list(void)
if (ret != EFI_SUCCESS)
goto out;
#endif
#ifdef CONFIG_CMD_NET
#ifdef CONFIG_NET
ret = efi_net_register();
if (ret != EFI_SUCCESS)
goto out;
@@ -511,7 +511,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)

bootefi_device_path = efi_dp_from_part(desc, part);
} else {
#ifdef CONFIG_CMD_NET
#ifdef CONFIG_NET
bootefi_device_path = efi_dp_from_eth();
#endif
}


+ 1
- 1
lib/efi_loader/Makefile View File

@@ -22,5 +22,5 @@ obj-y += efi_watchdog.o
obj-$(CONFIG_LCD) += efi_gop.o
obj-$(CONFIG_DM_VIDEO) += efi_gop.o
obj-$(CONFIG_PARTITIONS) += efi_disk.o
obj-$(CONFIG_CMD_NET) += efi_net.o
obj-$(CONFIG_NET) += efi_net.o
obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o

+ 1
- 1
lib/efi_loader/efi_device_path.c View File

@@ -747,7 +747,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
return start;
}

#ifdef CONFIG_CMD_NET
#ifdef CONFIG_NET
struct efi_device_path *efi_dp_from_eth(void)
{
#ifndef CONFIG_DM_ETH