diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2017-02-15 20:34:11 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-24 08:21:33 +0100 |
commit | 3858b78c1bea4d8b6aca73348edd48cbe59a428e (patch) | |
tree | d575f91e5d75c244d08b7196bc9b5445ab7543e0 | |
parent | 5596f405ff03cd5de12ad592a6d696e112fed0c1 (diff) | |
download | barebox-3858b78c1bea4d8b6aca73348edd48cbe59a428e.tar.gz barebox-3858b78c1bea4d8b6aca73348edd48cbe59a428e.tar.xz |
efi: move bus driver to driver/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/Kconfig | 1 | ||||
-rw-r--r-- | arch/efi/efi/Makefile | 1 | ||||
-rw-r--r-- | arch/efi/efi/efi-image.c | 4 | ||||
-rw-r--r-- | arch/efi/efi/efi.c | 4 | ||||
-rw-r--r-- | arch/efi/include/mach/debug_ll.h | 2 | ||||
-rw-r--r-- | drivers/Kconfig | 1 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/block/efi-block-io.c | 4 | ||||
-rw-r--r-- | drivers/clocksource/efi.c | 2 | ||||
-rw-r--r-- | drivers/efi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/efi/Makefile | 1 | ||||
-rw-r--r-- | drivers/efi/efi-device.c (renamed from arch/efi/efi/efi-device.c) | 4 | ||||
-rw-r--r-- | drivers/net/efi-snp.c | 4 | ||||
-rw-r--r-- | drivers/serial/efi-stdio.c | 2 | ||||
-rw-r--r-- | fs/efi.c | 4 | ||||
-rw-r--r-- | fs/efivarfs.c | 4 | ||||
-rw-r--r-- | include/efi/efi-device.h (renamed from arch/efi/include/mach/efi-device.h) | 6 | ||||
-rw-r--r-- | include/efi/efi.h (renamed from arch/efi/include/mach/efi.h) | 0 |
18 files changed, 26 insertions, 21 deletions
diff --git a/arch/efi/Kconfig b/arch/efi/Kconfig index 01301c04f7..561aac2b29 100644 --- a/arch/efi/Kconfig +++ b/arch/efi/Kconfig @@ -4,6 +4,7 @@ config ARCH_EFI select HAS_DEBUG_LL select HAS_KALLSYMS select EFI_GUID + select EFI_BOOTUP select EFI_DEVICEPATH select PRINTF_UUID select GENERIC_FIND_NEXT_BIT diff --git a/arch/efi/efi/Makefile b/arch/efi/efi/Makefile index 51db60b881..ef19969f93 100644 --- a/arch/efi/efi/Makefile +++ b/arch/efi/efi/Makefile @@ -1,4 +1,3 @@ obj-y += efi.o -obj-y += efi-device.o obj-y += efi-image.o bbenv-y += env-efi diff --git a/arch/efi/efi/efi-image.c b/arch/efi/efi/efi-image.c index 27f3c1b39c..885348da45 100644 --- a/arch/efi/efi/efi-image.c +++ b/arch/efi/efi/efi-image.c @@ -36,8 +36,8 @@ #include <libfile.h> #include <binfmt.h> #include <wchar.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> struct linux_kernel_header { /* first sector of the image */ diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c index 36ac016a91..b14e1e823b 100644 --- a/arch/efi/efi/efi.c +++ b/arch/efi/efi/efi.c @@ -38,8 +38,8 @@ #include <wchar.h> #include <envfs.h> #include <efi.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> efi_runtime_services_t *RT; efi_boot_services_t *BS; diff --git a/arch/efi/include/mach/debug_ll.h b/arch/efi/include/mach/debug_ll.h index 0fb2cb8c2a..4ca72de312 100644 --- a/arch/efi/include/mach/debug_ll.h +++ b/arch/efi/include/mach/debug_ll.h @@ -5,7 +5,7 @@ #define EFI_DEBUG_CLEAR_MEMORY 0 #include <efi.h> -#include <mach/efi.h> +#include <efi/efi.h> static inline void PUTC_LL(char c) { diff --git a/drivers/Kconfig b/drivers/Kconfig index cc086ac2df..bf31115fa0 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -1,5 +1,6 @@ menu "Drivers" +source "drivers/efi/Kconfig" source "drivers/of/Kconfig" source "drivers/aiodev/Kconfig" source "drivers/amba/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 9ff261ad29..0fadf4e44b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,6 +1,7 @@ obj-y += base/ obj-y += block/ obj-$(CONFIG_ARM_AMBA) += amba/ +obj-$(CONFIG_EFI_BOOTUP) += efi/ obj-y += net/ obj-y += serial/ obj-y += mtd/ diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c index e02d3b49cc..a4d9d3a95d 100644 --- a/drivers/block/efi-block-io.c +++ b/drivers/block/efi-block-io.c @@ -12,8 +12,8 @@ #include <efi.h> #include <block.h> #include <disks.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> #define EFI_BLOCK_IO_PROTOCOL_REVISION2 0x00020001 #define EFI_BLOCK_IO_PROTOCOL_REVISION3 ((2<<16) | (31)) diff --git a/drivers/clocksource/efi.c b/drivers/clocksource/efi.c index c92c35b112..59fd9918a1 100644 --- a/drivers/clocksource/efi.c +++ b/drivers/clocksource/efi.c @@ -1,6 +1,6 @@ #include <common.h> #include <efi.h> -#include <mach/efi.h> +#include <efi/efi.h> #include <clock.h> #ifdef __x86_64__ diff --git a/drivers/efi/Kconfig b/drivers/efi/Kconfig new file mode 100644 index 0000000000..2cd9dd504f --- /dev/null +++ b/drivers/efi/Kconfig @@ -0,0 +1,2 @@ +config EFI_BOOTUP + bool diff --git a/drivers/efi/Makefile b/drivers/efi/Makefile new file mode 100644 index 0000000000..de31212f25 --- /dev/null +++ b/drivers/efi/Makefile @@ -0,0 +1 @@ +obj-y += efi-device.o diff --git a/arch/efi/efi/efi-device.c b/drivers/efi/efi-device.c index 678a28399d..2864d0cf1c 100644 --- a/arch/efi/efi/efi-device.c +++ b/drivers/efi/efi-device.c @@ -27,8 +27,8 @@ #include <wchar.h> #include <init.h> #include <efi.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> #include <linux/err.h> int efi_locate_handle(enum efi_locate_search_type search_type, diff --git a/drivers/net/efi-snp.c b/drivers/net/efi-snp.c index 963d539db3..23edc9f04f 100644 --- a/drivers/net/efi-snp.c +++ b/drivers/net/efi-snp.c @@ -23,8 +23,8 @@ #include <net.h> #include <init.h> #include <efi.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> struct efi_network_statistics { uint64_t RxTotalFrames; diff --git a/drivers/serial/efi-stdio.c b/drivers/serial/efi-stdio.c index 5ab917386e..0703f727e7 100644 --- a/drivers/serial/efi-stdio.c +++ b/drivers/serial/efi-stdio.c @@ -25,7 +25,7 @@ #include <efi.h> #include <readkey.h> #include <linux/ctype.h> -#include <mach/efi.h> +#include <efi/efi.h> #define EFI_SHIFT_STATE_VALID 0x80000000 #define EFI_RIGHT_CONTROL_PRESSED 0x00000004 @@ -31,8 +31,8 @@ #include <wchar.h> #include <efi.h> #include <libfile.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> #include <linux/stddef.h> /* Open modes */ diff --git a/fs/efivarfs.c b/fs/efivarfs.c index 86cdcf0b59..bf7351e6db 100644 --- a/fs/efivarfs.c +++ b/fs/efivarfs.c @@ -31,8 +31,8 @@ #include <wchar.h> #include <linux/err.h> #include <linux/ctype.h> -#include <mach/efi.h> -#include <mach/efi-device.h> +#include <efi/efi.h> +#include <efi/efi-device.h> struct efivarfs_inode { s16 *name; diff --git a/arch/efi/include/mach/efi-device.h b/include/efi/efi-device.h index fe074a44bb..8f5f1f3f13 100644 --- a/arch/efi/include/mach/efi-device.h +++ b/include/efi/efi-device.h @@ -1,5 +1,5 @@ -#ifndef __MACH_EFI_DEVICE_H -#define __MACH_EFI_DEVICE_H +#ifndef __EFI_EFI_DEVICE_H +#define __EFI_EFI_DEVICE_H struct efi_device { struct device_d dev; @@ -42,4 +42,4 @@ static inline int efi_driver_register(struct efi_driver *efidrv) int efi_connect_all(void); void efi_register_devices(void); -#endif /* __MACH_EFI_DEVICE_H */ +#endif /* __EFI_EFI_DEVICE_H */ diff --git a/arch/efi/include/mach/efi.h b/include/efi/efi.h index 2b25cf1868..2b25cf1868 100644 --- a/arch/efi/include/mach/efi.h +++ b/include/efi/efi.h |