Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> --- arch/efi/Makefile | 2 +- common/Makefile | 1 + {arch/efi => common}/efi/Makefile | 0 {arch/efi => common}/efi/efi-image.c | 0 {arch/efi => common}/efi/efi.c | 2 +- {arch/efi => common}/efi/env-efi/network/eth0-discover | 0 6 files changed, 3 insertions(+), 2 deletions(-) rename {arch/efi => common}/efi/Makefile (100%) rename {arch/efi => common}/efi/efi-image.c (100%) rename {arch/efi => common}/efi/efi.c (99%) rename {arch/efi => common}/efi/env-efi/network/eth0-discover (100%) diff --git a/arch/efi/Makefile b/arch/efi/Makefile index 32a1c152b..c87a421ad 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 869b15a92..5f58c81d2 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 similarity index 100% rename from arch/efi/efi/Makefile rename to common/efi/Makefile diff --git a/arch/efi/efi/efi-image.c b/common/efi/efi-image.c similarity index 100% rename from arch/efi/efi/efi-image.c rename to common/efi/efi-image.c diff --git a/arch/efi/efi/efi.c b/common/efi/efi.c similarity index 99% rename from arch/efi/efi/efi.c rename to common/efi/efi.c index b14e1e823..217a6bea8 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 similarity index 100% rename from arch/efi/efi/env-efi/network/eth0-discover rename to common/efi/env-efi/network/eth0-discover -- 2.11.0 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox