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

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

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Duncan Hare <dh@synoia.com>

diff --git a/Kconfig b/Kconfig
index 0b73006a68c1b28d61aa93175943064ddfeeaf10..081be6ce6bf9c2e63a8b725292820c6a0b618586 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -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

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 5a2a81005fcf734fbb873537f7b9f216f7d75e38..5498a5fccf78a991c19e5ced865fc4f3065311d8 100644 (file)
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -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
        }

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index d2ce89713ec737036fddcfc6fbab98e19467b6b1..55c97c047666e9d961879475c1c655e44e228d73 100644 (file)
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -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

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index ab28b2fd257cdfaefe3201b55160f7d9c9135f46..e965f1d88eda378e6a27e9644ca4c7be1ec29d84 100644 (file)
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -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