The split between <efi.h> and <efi/efi.h> is confusing: The former
contains universal definitions, while the latter contains barebox
utilities on top. To make the distinction clear, rename <efi/efi.h>
to <efi/efi-payload.h> as it's used for EFI payloads.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
common/efi/payload/image.c | 2 +-
common/efi/payload/init.c | 2 +-
common/efi/payload/iomem.c | 2 +-
drivers/block/efi-block-io.c | 2 +-
drivers/bus/acpi.c | 3 ++-
drivers/clocksource/efi.c | 2 +-
drivers/clocksource/efi_x86.c | 2 +-
drivers/efi/efi-device.c | 2 +-
drivers/net/efi-snp.c | 2 +-
drivers/pci/pci-efi.c | 2 +-
drivers/serial/efi-stdio.c | 2 +-
drivers/serial/serial_efi.c | 2 +-
drivers/video/efi_gop.c | 2 +-
drivers/watchdog/efi_wdt.c | 2 +-
fs/efi.c | 2 +-
fs/efivarfs.c | 2 +-
include/efi/debug_ll.h | 2 +-
include/efi/{efi.h => efi-payload.h} | 6 +++---
18 files changed, 21 insertions(+), 20 deletions(-)
rename include/efi/{efi.h => efi-payload.h} (90%)
diff --git a/common/efi/payload/image.c b/common/efi/payload/image.c
index 53b444eef60f..3bcb8fce2df5 100644
--- a/common/efi/payload/image.c
+++ b/common/efi/payload/image.c
@@ -24,7 +24,7 @@
#include <libfile.h>
#include <binfmt.h>
#include <wchar.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
struct linux_kernel_header {
diff --git a/common/efi/payload/init.c b/common/efi/payload/init.c
index 5149b5b5d0d3..e1f968117a01 100644
--- a/common/efi/payload/init.c
+++ b/common/efi/payload/init.c
@@ -28,7 +28,7 @@
#include <wchar.h>
#include <envfs.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <libfile.h>
#include <state.h>
diff --git a/common/efi/payload/iomem.c b/common/efi/payload/iomem.c
index 4d34328a5802..6b92ca993aa7 100644
--- a/common/efi/payload/iomem.c
+++ b/common/efi/payload/iomem.c
@@ -6,7 +6,7 @@
#include <common.h>
#include <init.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <memory.h>
#include <linux/sizes.h>
diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c
index 04234b5ab2d4..5fd82296dc54 100644
--- a/drivers/block/efi-block-io.c
+++ b/drivers/block/efi-block-io.c
@@ -13,7 +13,7 @@
#include <efi.h>
#include <block.h>
#include <disks.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <bootsource.h>
diff --git a/drivers/bus/acpi.c b/drivers/bus/acpi.c
index 2515b6633b33..efba3f4c1671 100644
--- a/drivers/bus/acpi.c
+++ b/drivers/bus/acpi.c
@@ -6,7 +6,8 @@
#include <common.h>
#include <driver.h>
#include <init.h>
-#include <efi/efi.h>
+#include <efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <acpi.h>
diff --git a/drivers/clocksource/efi.c b/drivers/clocksource/efi.c
index 10f75c033ea8..924ab1c34607 100644
--- a/drivers/clocksource/efi.c
+++ b/drivers/clocksource/efi.c
@@ -7,7 +7,7 @@
#include <driver.h>
#include <clock.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <linux/err.h>
diff --git a/drivers/clocksource/efi_x86.c b/drivers/clocksource/efi_x86.c
index c79862fb990f..75163d6e4774 100644
--- a/drivers/clocksource/efi_x86.c
+++ b/drivers/clocksource/efi_x86.c
@@ -3,7 +3,7 @@
#include <init.h>
#include <driver.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <clock.h>
#ifdef __x86_64__
diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c
index 25c8eeaf01cb..4c10f419b11e 100644
--- a/drivers/efi/efi-device.c
+++ b/drivers/efi/efi-device.c
@@ -16,7 +16,7 @@
#include <wchar.h>
#include <init.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <linux/err.h>
diff --git a/drivers/net/efi-snp.c b/drivers/net/efi-snp.c
index def2714bee47..cc34ad5aafa7 100644
--- a/drivers/net/efi-snp.c
+++ b/drivers/net/efi-snp.c
@@ -11,7 +11,7 @@
#include <net.h>
#include <init.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
struct efi_network_statistics {
diff --git a/drivers/pci/pci-efi.c b/drivers/pci/pci-efi.c
index 846449c4b0e0..c0bcc10044ce 100644
--- a/drivers/pci/pci-efi.c
+++ b/drivers/pci/pci-efi.c
@@ -9,7 +9,7 @@
#include <init.h>
#include <xfuncs.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <linux/pci.h>
diff --git a/drivers/serial/efi-stdio.c b/drivers/serial/efi-stdio.c
index d5049dfdadf3..7509f16b86c2 100644
--- a/drivers/serial/efi-stdio.c
+++ b/drivers/serial/efi-stdio.c
@@ -13,7 +13,7 @@
#include <efi.h>
#include <readkey.h>
#include <linux/ctype.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <efi/efi-stdio.h>
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 5da90965755b..24a53a9019ba 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -8,7 +8,7 @@
#include <init.h>
#include <malloc.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
/*
diff --git a/drivers/video/efi_gop.c b/drivers/video/efi_gop.c
index 2155ec163fd2..45dc42fa3e55 100644
--- a/drivers/video/efi_gop.c
+++ b/drivers/video/efi_gop.c
@@ -12,7 +12,7 @@
#include <errno.h>
#include <gui/graphic_utils.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#define PIXEL_RGB_RESERVED_8BIT_PER_COLOR 0
diff --git a/drivers/watchdog/efi_wdt.c b/drivers/watchdog/efi_wdt.c
index 1512b1d99aae..eb50f24aed57 100644
--- a/drivers/watchdog/efi_wdt.c
+++ b/drivers/watchdog/efi_wdt.c
@@ -7,7 +7,7 @@
#include <init.h>
#include <driver.h>
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <watchdog.h>
struct efi_wdt_priv {
diff --git a/fs/efi.c b/fs/efi.c
index edf65179fdbd..ca43cf6c48ab 100644
--- a/fs/efi.c
+++ b/fs/efi.c
@@ -28,7 +28,7 @@
#include <wchar.h>
#include <efi.h>
#include <libfile.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
#include <linux/stddef.h>
diff --git a/fs/efivarfs.c b/fs/efivarfs.c
index 659716f845f2..01947439ff6c 100644
--- a/fs/efivarfs.c
+++ b/fs/efivarfs.c
@@ -28,7 +28,7 @@
#include <wchar.h>
#include <linux/err.h>
#include <linux/ctype.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
#include <efi/efi-device.h>
struct efivarfs_inode {
diff --git a/include/efi/debug_ll.h b/include/efi/debug_ll.h
index 905f1c43cd23..279e8995f2b3 100644
--- a/include/efi/debug_ll.h
+++ b/include/efi/debug_ll.h
@@ -6,7 +6,7 @@
#define EFI_DEBUG_CLEAR_MEMORY 0
#include <efi.h>
-#include <efi/efi.h>
+#include <efi/efi-payload.h>
static inline void PUTC_LL(char c)
{
diff --git a/include/efi/efi.h b/include/efi/efi-payload.h
similarity index 90%
rename from include/efi/efi.h
rename to include/efi/efi-payload.h
index e77b1c5feb52..a2daff08bb3f 100644
--- a/include/efi/efi.h
+++ b/include/efi/efi-payload.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __MACH_EFI_H
-#define __MACH_EFI_H
+#ifndef __EFI_PAYLOAD_H
+#define __EFI_PAYLOAD_H
#include <efi.h>
#include <efi/efi-util.h>
@@ -21,4 +21,4 @@ int efi_set_variable(char *name, efi_guid_t *vendor, uint32_t attributes,
void *buf, unsigned long size);
int efi_set_variable_usec(char *name, efi_guid_t *vendor, uint64_t usec);
-#endif /* __MACH_EFI_H */
+#endif
--
2.30.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
