summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2017-02-15 20:34:13 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-24 08:21:33 +0100
commitc3931154de674962db4a633794ec9dcd3f9d4fef (patch)
tree627aaba581fc2c1203889ff2862b96a1beb63b20
parentc7263b02f83c330ffaf0f7f7128f747681e08a9e (diff)
downloadbarebox-c3931154de674962db4a633794ec9dcd3f9d4fef.tar.gz
efi: move startup and payload to common/efi
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/efi/Makefile2
-rw-r--r--common/Makefile1
-rw-r--r--common/efi/Makefile (renamed from arch/efi/efi/Makefile)0
-rw-r--r--common/efi/efi-image.c (renamed from arch/efi/efi/efi-image.c)0
-rw-r--r--common/efi/efi.c (renamed from arch/efi/efi/efi.c)2
-rw-r--r--common/efi/env-efi/network/eth0-discover (renamed from arch/efi/efi/env-efi/network/eth0-discover)0
6 files changed, 3 insertions, 2 deletions
diff --git a/arch/efi/Makefile b/arch/efi/Makefile
index 32a1c15..c87a421 100644
--- a/arch/efi/Makefile
+++ b/arch/efi/Makefile
@@ -40,4 +40,4 @@ barebox.efi: $(KBUILD_BINARY) FORCE
KBUILD_IMAGE := barebox.efi
-common-y += arch/efi/efi/ arch/efi/lib/
+common-y += arch/efi/lib/
diff --git a/common/Makefile b/common/Makefile
index 869b15a..5f58c81 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -50,6 +50,7 @@ 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_BOOTUP) += efi/
obj-$(CONFIG_EFI_GUID) += efi-guid.o
obj-$(CONFIG_EFI_DEVICEPATH) += efi-devicepath.o
lwl-$(CONFIG_IMD) += imd-barebox.o
diff --git a/arch/efi/efi/Makefile b/common/efi/Makefile
index ef19969..ef19969 100644
--- a/arch/efi/efi/Makefile
+++ b/common/efi/Makefile
diff --git a/arch/efi/efi/efi-image.c b/common/efi/efi-image.c
index 885348d..885348d 100644
--- a/arch/efi/efi/efi-image.c
+++ b/common/efi/efi-image.c
diff --git a/arch/efi/efi/efi.c b/common/efi/efi.c
index b14e1e8..217a6be 100644
--- a/arch/efi/efi/efi.c
+++ b/common/efi/efi.c
@@ -119,7 +119,7 @@ struct efi_boot {
void *binary;
};
-struct efi_boot *efi_get_boot(int num)
+static struct efi_boot *efi_get_boot(int num)
{
struct efi_boot *boot = xzalloc(sizeof(*boot));
void *buf, *ptr;
diff --git a/arch/efi/efi/env-efi/network/eth0-discover b/common/efi/env-efi/network/eth0-discover
index 62c31a5..62c31a5 100644
--- a/arch/efi/efi/env-efi/network/eth0-discover
+++ b/common/efi/env-efi/network/eth0-discover