Created /lib/efi_loader/net/ and moved efi_net.c, efi_http.c, and
efi_ipconfig.c into it. Previously, efi_net.c contained implementations
for all supported EFI network protocols, which made the file bloated
and hard to maintain.
Now, each protocol has its own file under net/. efi_net.c is responsible
only for installing and uninstalling these protocols on EFI network
devices.
Signed-off-by: Adriano Cordova <adriano.cord...@canonical.com>
---
doc/api/efi.rst | 2 +-
lib/efi_loader/Makefile | 4 +---
lib/efi_loader/net/Makefile | 3 +++
lib/efi_loader/{ => net}/efi_http.c | 0
lib/efi_loader/{ => net}/efi_ipconfig.c | 0
lib/efi_loader/{ => net}/efi_net.c | 0
6 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 lib/efi_loader/net/Makefile
rename lib/efi_loader/{ => net}/efi_http.c (100%)
rename lib/efi_loader/{ => net}/efi_ipconfig.c (100%)
rename lib/efi_loader/{ => net}/efi_net.c (100%)
diff --git a/doc/api/efi.rst b/doc/api/efi.rst
index 43d6f936fb0..9df9fd223a1 100644
--- a/doc/api/efi.rst
+++ b/doc/api/efi.rst
@@ -145,7 +145,7 @@ RAM disk. U-Boot can be configured to provide an
implementation.
Network protocols
~~~~~~~~~~~~~~~~~
-.. kernel-doc:: lib/efi_loader/efi_net.c
+.. kernel-doc:: lib/efi_loader/net/efi_net.c
:internal:
Random number generator protocol
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index cf050e5385d..92c6822bc13 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -59,9 +59,7 @@ obj-y += efi_watchdog.o
obj-$(CONFIG_EFI_ESRT) += efi_esrt.o
obj-$(CONFIG_VIDEO) += efi_gop.o
obj-$(CONFIG_BLK) += efi_disk.o
-obj-$(CONFIG_NETDEVICES) += efi_net.o
-obj-$(CONFIG_EFI_IP4_CONFIG2_PROTOCOL) += efi_ipconfig.o
-obj-$(CONFIG_EFI_HTTP_PROTOCOL) += efi_http.o
+obj-$(CONFIG_NETDEVICES) += net/
obj-$(CONFIG_ACPI) += efi_acpi.o
obj-$(CONFIG_SMBIOS) += efi_smbios.o
obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_rng.o
diff --git a/lib/efi_loader/net/Makefile b/lib/efi_loader/net/Makefile
new file mode 100644
index 00000000000..ab41f358de9
--- /dev/null
+++ b/lib/efi_loader/net/Makefile
@@ -0,0 +1,3 @@
+obj-y += efi_net.o
+obj-$(CONFIG_EFI_IP4_CONFIG2_PROTOCOL) += efi_ipconfig.o
+obj-$(CONFIG_EFI_HTTP_PROTOCOL) += efi_http.o
\ No newline at end of file
diff --git a/lib/efi_loader/efi_http.c b/lib/efi_loader/net/efi_http.c
similarity index 100%
rename from lib/efi_loader/efi_http.c
rename to lib/efi_loader/net/efi_http.c
diff --git a/lib/efi_loader/efi_ipconfig.c b/lib/efi_loader/net/efi_ipconfig.c
similarity index 100%
rename from lib/efi_loader/efi_ipconfig.c
rename to lib/efi_loader/net/efi_ipconfig.c
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/net/efi_net.c
similarity index 100%
rename from lib/efi_loader/efi_net.c
rename to lib/efi_loader/net/efi_net.c
--
2.48.1
