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@xxxxxxxxxxxxxx>
---
Kconfig | 1 +
Makefile | 1 +
common/Kconfig | 2 --
common/Makefile | 1 -
{common/efi => efi}/Kconfig | 0
{common/efi => efi}/Makefile | 0
{common/efi => efi}/devicepath.c | 0
{common/efi => efi}/efivar-filename.c | 0
{common/efi => efi}/errno.c | 0
{common/efi => efi}/guid.c | 0
{common/efi => efi}/payload/Makefile | 0
{common/efi => efi}/payload/env-efi/network/eth0-discover | 0
{common/efi => efi}/payload/fdt.c | 0
{common/efi => efi}/payload/image.c | 0
{common/efi => efi}/payload/init.c | 0
{common/efi => efi}/payload/iomem.c | 0
16 files changed, 2 insertions(+), 3 deletions(-)
rename {common/efi => efi}/Kconfig (100%)
rename {common/efi => efi}/Makefile (100%)
rename {common/efi => efi}/devicepath.c (100%)
rename {common/efi => efi}/efivar-filename.c (100%)
rename {common/efi => efi}/errno.c (100%)
rename {common/efi => efi}/guid.c (100%)
rename {common/efi => efi}/payload/Makefile (100%)
rename {common/efi => efi}/payload/env-efi/network/eth0-discover (100%)
rename {common/efi => efi}/payload/fdt.c (100%)
rename {common/efi => efi}/payload/image.c (100%)
rename {common/efi => efi}/payload/init.c (100%)
rename {common/efi => efi}/payload/iomem.c (100%)
diff --git a/Kconfig b/Kconfig
index 4c076026b0c9..9c3a20a9a9a3 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 6c70767e9070..358cd4140ce8 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 cb0fef46ccbe..a7034a166189 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 c31cbab9e48f..42edb40999b1 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
similarity index 100%
rename from common/efi/Kconfig
rename to efi/Kconfig
diff --git a/common/efi/Makefile b/efi/Makefile
similarity index 100%
rename from common/efi/Makefile
rename to efi/Makefile
diff --git a/common/efi/devicepath.c b/efi/devicepath.c
similarity index 100%
rename from common/efi/devicepath.c
rename to efi/devicepath.c
diff --git a/common/efi/efivar-filename.c b/efi/efivar-filename.c
similarity index 100%
rename from common/efi/efivar-filename.c
rename to efi/efivar-filename.c
diff --git a/common/efi/errno.c b/efi/errno.c
similarity index 100%
rename from common/efi/errno.c
rename to efi/errno.c
diff --git a/common/efi/guid.c b/efi/guid.c
similarity index 100%
rename from common/efi/guid.c
rename to efi/guid.c
diff --git a/common/efi/payload/Makefile b/efi/payload/Makefile
similarity index 100%
rename from common/efi/payload/Makefile
rename to efi/payload/Makefile
diff --git a/common/efi/payload/env-efi/network/eth0-discover b/efi/payload/env-efi/network/eth0-discover
similarity index 100%
rename from common/efi/payload/env-efi/network/eth0-discover
rename to efi/payload/env-efi/network/eth0-discover
diff --git a/common/efi/payload/fdt.c b/efi/payload/fdt.c
similarity index 100%
rename from common/efi/payload/fdt.c
rename to efi/payload/fdt.c
diff --git a/common/efi/payload/image.c b/efi/payload/image.c
similarity index 100%
rename from common/efi/payload/image.c
rename to efi/payload/image.c
diff --git a/common/efi/payload/init.c b/efi/payload/init.c
similarity index 100%
rename from common/efi/payload/init.c
rename to efi/payload/init.c
diff --git a/common/efi/payload/iomem.c b/efi/payload/iomem.c
similarity index 100%
rename from common/efi/payload/iomem.c
rename to efi/payload/iomem.c
--
2.39.2
