From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 05/12] efi: move startup and payload to common/efi
Date: Wed, 15 Feb 2017 20:34:13 +0100 [thread overview]
Message-ID: <1487187257-29082-5-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1487187257-29082-1-git-send-email-plagnioj@jcrosoft.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-02-15 19:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 19:29 [PATCH 0/12] EFI: drop arch efi Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` [PATCH 01/12] efi: move block io driver to driver/block Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` [PATCH 02/12] efi: move clocksource out of arch Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` [PATCH 03/12] efi: move bus driver to driver/efi Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` [PATCH 04/12] efi: move debug_ll.h to include/efi Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2017-02-15 19:34 ` [PATCH 06/12] x86: move bios bootup code to arch/x86/bios Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` [PATCH 07/12] efi: move x86 efi boot support to x86 arch Jean-Christophe PLAGNIOL-VILLARD
2017-02-16 7:27 ` Michael Olbrich
2017-02-23 11:39 ` Jean-Christophe PLAGNIOL-VILLARD
2017-02-27 7:50 ` Sascha Hauer
2017-03-07 8:31 ` [PATCH] fixup! " Michael Olbrich
2017-03-09 6:37 ` Sascha Hauer
2017-02-15 19:34 ` [PATCH 08/12] ARCH: efi: Finally drop it as now we can build efi bootup from x86 Jean-Christophe PLAGNIOL-VILLARD
2017-02-15 19:34 ` [PATCH 09/12] efi: bus: add firmware vendor and resision and tables info Jean-Christophe PLAGNIOL-VILLARD
2017-02-16 7:38 ` [PATCH 0/12] EFI: drop arch efi Michael Olbrich
2017-02-16 7:42 ` Michael Olbrich
2017-02-20 3:10 ` [PATCH 10/12] efi: add minor and major to the bus and display it at boot Jean-Christophe PLAGNIOL-VILLARD
2017-02-20 3:10 ` [PATCH 11/12] efi-gui: add Timestamp Protocol GUID definition Jean-Christophe PLAGNIOL-VILLARD
2017-02-20 3:10 ` [PATCH 12/12] efi: add efi handle dump command Jean-Christophe PLAGNIOL-VILLARD
2017-03-11 16:26 ` [PATCH 0/12] EFI: drop arch efi Michael Olbrich
2017-03-12 12:05 ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-13 10:27 ` Michael Olbrich
2017-03-13 10:48 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487187257-29082-5-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox