[U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET"

[Duncan Hare]

From: Joe Hershberger <joe.hershberger at ni.com>


 To: u-boot at lists.denx.de 
Cc: Heinrich <Schuchardt.xypron.debian at gmx.de>; Michal Simek <michal.simek at xilinx.com>; Simon Glass <sjg at chromium.org>; Duncan Hare <dh at synoia.com>; Tom Rini <trini at konsulko.com>; Maxime Ripard <maxime.ripard at bootlin.com>; Joe Hershberger <joe.hershberger at ni.com>
 Sent: Wednesday, March 28, 2018 1:53 PM
 Subject: [PATCH 9/9] 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 at ni.com>

---

 Kconfig                          | 2 +-
 cmd/bootefi.c                    | 4 ++--
 lib/efi_loader/Makefile          | 2 +-
 lib/efi_loader/efi_device_path.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Kconfig b/Kconfig
index 17e6212..89f685b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -70,7 +70,7 @@ config DISTRO_DEFAULTS
     select CMD_BOOTZ if ARM && !ARM64
     select CMD_BOOTI if ARM64
     select CMD_DHCP if NET && 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 6546272..7b1c09f 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -42,7 +42,7 @@ static void efi_init_obj_list(void)
 #if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
     efi_gop_register();
 #endif
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
     efi_net_register();
 #endif
 #ifdef CONFIG_GENERATE_SMBIOS_TABLE
@@ -450,7 +450,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 2a87d9e..2722265 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -21,5 +21,5 @@ obj-y += efi_file.o efi_variable.o efi_bootmgr.o 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 3c735e6..ecc4eda 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -746,7 +746,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)
 {
     struct efi_device_path_mac_addr *ndp;
-- 
1.7.11.5


Reviewed by Duncan Hare dh at synoia.com