common: efi: move directory to top-level

The EFI code will grow considerably with the addition of loader support,
so it makes sense to move it to top-level to shorten the path and to
improve visibility.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20240304190038.3486881-8-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

16 files changed, 2 insertions, 3 deletions

diff --git a/Kconfig b/Kconfig
index 4c076026b0..9c3a20a9a9 100644
--- a/Kconfig
+++ b/Kconfig
@@ -11,6 +11,7 @@ source "scripts/Kconfig.include"
 source "arch/Kconfig"
 
 source "common/Kconfig"
+source "efi/Kconfig"
 source "commands/Kconfig"
 source "net/Kconfig"
 source "drivers/Kconfig"
diff --git a/Makefile b/Makefile
index 6c70767e90..358cd4140c 100644
--- a/Makefile
+++ b/Makefile
@@ -601,6 +601,7 @@ common-y		:= common/ drivers/ commands/ lib/ crypto/ net/ fs/ firmware/
 
 include $(srctree)/arch/$(SRCARCH)/Makefile
 
+common-$(CONFIG_EFI)	+= efi/
 common-y		+= test/
 
 ifdef need-config
diff --git a/common/Kconfig b/common/Kconfig
index cb0fef46cc..a7034a1661 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1800,8 +1800,6 @@ config WERROR
 
 endmenu
 
-source "common/efi/Kconfig"
-
 config HAS_DEBUG_LL
 	bool
 
diff --git a/common/Makefile b/common/Makefile
index c31cbab9e4..42edb40999 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -70,7 +70,6 @@ obj-$(CONFIG_BOOTCHOOSER)	+= bootchooser.o
 obj-$(CONFIG_UIMAGE)		+= image.o uimage.o
 obj-$(CONFIG_FITIMAGE)		+= image-fit.o
 obj-$(CONFIG_MENUTREE)		+= menutree.o
-obj-$(CONFIG_EFI)		+= efi/
 lwl-$(CONFIG_IMD)		+= imd-barebox.o
 obj-$(CONFIG_IMD)		+= imd.o
 obj-y				+= file-list.o
diff --git a/common/efi/Kconfig b/efi/Kconfig
index 15246ccbf0..15246ccbf0 100644
--- a/common/efi/Kconfig
+++ b/efi/Kconfig
diff --git a/common/efi/Makefile b/efi/Makefile
index a7cebde4f1..a7cebde4f1 100644
--- a/common/efi/Makefile
+++ b/efi/Makefile
diff --git a/common/efi/devicepath.c b/efi/devicepath.c
index 584f1fbd1d..584f1fbd1d 100644
--- a/common/efi/devicepath.c
+++ b/efi/devicepath.c
diff --git a/common/efi/efivar-filename.c b/efi/efivar-filename.c
index 51d0130fa7..51d0130fa7 100644
--- a/common/efi/efivar-filename.c
+++ b/efi/efivar-filename.c
diff --git a/common/efi/errno.c b/efi/errno.c
index 3bb68e7781..3bb68e7781 100644
--- a/common/efi/errno.c
+++ b/efi/errno.c
diff --git a/common/efi/guid.c b/efi/guid.c
index ca16f4520f..ca16f4520f 100644
--- a/common/efi/guid.c
+++ b/efi/guid.c
diff --git a/common/efi/payload/Makefile b/efi/payload/Makefile
index eeed046b00..eeed046b00 100644
--- a/common/efi/payload/Makefile
+++ b/efi/payload/Makefile
diff --git a/common/efi/payload/env-efi/network/eth0-discover b/efi/payload/env-efi/network/eth0-discover
index 62c31a553c..62c31a553c 100644
--- a/common/efi/payload/env-efi/network/eth0-discover
+++ b/efi/payload/env-efi/network/eth0-discover
diff --git a/common/efi/payload/fdt.c b/efi/payload/fdt.c
index dbbc93fb7d..dbbc93fb7d 100644
--- a/common/efi/payload/fdt.c
+++ b/efi/payload/fdt.c
diff --git a/common/efi/payload/image.c b/efi/payload/image.c
index 8e39098ae8..8e39098ae8 100644
--- a/common/efi/payload/image.c
+++ b/efi/payload/image.c
diff --git a/common/efi/payload/init.c b/efi/payload/init.c
index bb4c156d68..bb4c156d68 100644
--- a/common/efi/payload/init.c
+++ b/efi/payload/init.c
diff --git a/common/efi/payload/iomem.c b/efi/payload/iomem.c
index 6b92ca993a..6b92ca993a 100644
--- a/common/efi/payload/iomem.c
+++ b/efi/payload/iomem.c