Skip to contentSkip to conversation

EFI: drop arch efi

PATCH In review Jean-Christophe PLAGNIOL-VILLARD 2 participants 13 messages Feb 10, 2017 – Feb 15, 2017

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

cover EFI: drop arch efi

Today the EFI is build as an other ARCH when in fact it's just a boot mode

so move it back to arch/x86 for the spicific x86 part and the common to common and driver

The following changes since commit 55d29525146dcd280987dfd565bfd34f08858fb3:

ata: ide-sff: don't call free for ide_port in error path (2017-01-18 12:01:38 +0100)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git

for you to fetch changes up to 3e07e7f43bcfb5160cc6104f06535f147222570b:

efi: bus: add firmware vendor and resision and tables info (2017-02-09 17:13:41 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (9):
efi: move block io driver to driver/block
efi: move clocksource out of arch
efi: move bus driver to driver/efi
efi: move debug_ll.h to include/efi
efi: move startup and payload to common/efi
x86: move bios bootup code to arch/x86/bios
efi: move x86 efi boot support to x86 arch
ARCH: efi: Finally drop it as now we can build efi bootup from x86
efi: bus: add firmware vendor and resision and tables info

 Documentation/boards/efi.rst                            |  2 +-
 arch/efi/Kconfig                                        | 51 ---------------------------------------------------
 arch/efi/Makefile                                       | 43 -------------------------------------------
 arch/efi/efi/Makefile                                   |  2 --
 arch/efi/include/asm/barebox.h                          |  1 -
 arch/efi/include/asm/bitops.h                           | 22 ----------------------
 arch/efi/include/asm/bitsperlong.h                      | 10 ----------
 arch/efi/include/asm/byteorder.h                        |  8 --------
 arch/efi/include/asm/common.h                           |  4 ----
 arch/efi/include/asm/dma.h                              | 13 -------------
 arch/efi/include/asm/elf.h                              | 60 ------------------------------------------------------------
 arch/efi/include/asm/io.h                               | 55 -------------------------------------------------------
 arch/efi/include/asm/posix_types.h                      |  1 -
 arch/efi/include/asm/sections.h                         |  1 -
 arch/efi/include/asm/string.h                           |  1 -
 arch/efi/include/asm/swab.h                             |  6 ------
 arch/efi/include/asm/types.h                            | 65 -----------------------------------------------------------------
 arch/efi/include/asm/unaligned.h                        | 19 -------------------
 arch/efi/lib/.gitignore                                 |  2 --
 arch/efi/lib/asm-offsets.c                              | 12 ------------
 arch/x86/Kconfig                                        | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 arch/x86/Makefile                                       | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 arch/x86/bios/Makefile                                  |  3 +++
 arch/x86/{lib => bios}/bios_disk.S                      |  0
 arch/x86/{lib => bios}/memory16.S                       |  0
 arch/x86/{lib => bios}/traveler.S                       |  0
 arch/{efi => x86}/configs/efi_defconfig                 |  2 +-
 arch/x86/configs/generic_defconfig                      |  1 +
 arch/x86/include/asm/elf.h                              | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 arch/x86/include/asm/io.h                               | 71 +++++++++++++++++++++++++++++++++--------------------------------------
 arch/x86/include/asm/types.h                            | 51 +++++++++++++++++++++++++++++++++------------------
 arch/x86/include/asm/unaligned.h                        |  5 +++++
 arch/x86/lib/Makefile                                   |  5 ++---
 arch/x86/lib/asm-offsets.c                              |  7 +++++++
 arch/{efi/lib => x86/mach-efi}/Makefile                 |  0
 arch/{efi/lib => x86/mach-efi}/crt0-efi-ia32.S          |  0
 arch/{efi/lib => x86/mach-efi}/crt0-efi-x86_64.S        |  0
 arch/{efi/lib => x86/mach-efi}/elf_ia32_efi.lds.S       |  0
 arch/{efi/lib => x86/mach-efi}/elf_x86_64_efi.lds.S     |  0
 arch/x86/mach-efi/include/mach/debug_ll.h               |  1 +
 arch/{efi/lib => x86/mach-efi}/reloc_ia32.c             |  0
 arch/{efi/lib => x86/mach-efi}/reloc_x86_64.c           |  0
 commands/Kconfig                                        |  2 +-
 commands/edit.c                                         |  2 +-
 common/Kconfig                                          |  5 +++++
 common/Makefile                                         |  1 +
 common/efi/Makefile                                     |  3 +++
 {arch/efi => common}/efi/efi-image.c                    |  4 ++--
 {arch/efi => common}/efi/efi.c                          |  6 +++---
 {arch/efi => common}/efi/env-efi/network/eth0-discover  |  0
 common/memory.c                                         |  2 +-
 drivers/Makefile                                        |  2 ++
 drivers/block/Makefile                                  |  1 +
 {arch/efi/efi => drivers/block}/efi-block-io.c          |  4 ++--
 drivers/clocksource/Kconfig                             |  4 ++++
 drivers/clocksource/Makefile                            |  1 +
 arch/efi/efi/clocksource.c => drivers/clocksource/efi.c |  2 +-
 drivers/efi/Makefile                                    |  1 +
 {arch/efi => drivers}/efi/efi-device.c                  | 27 +++++++++++++++++++++++++--
 drivers/net/Kconfig                                     |  2 +-
 drivers/net/efi-snp.c                                   |  4 ++--
 drivers/of/Kconfig                                      |  2 +-
 drivers/serial/Kconfig                                  |  2 +-
 drivers/serial/efi-stdio.c                              |  2 +-
 fs/Kconfig                                              |  4 ++--
 fs/efi.c                                                |  4 ++--
 fs/efivarfs.c                                           |  4 ++--
 include/efi.h                                           |  9 +++++++--
 {arch/efi/include/mach => include/efi}/debug_ll.h       |  2 +-
 {arch/efi/include/mach => include/efi}/efi-device.h     |  0
 {arch/efi/include/mach => include/efi}/efi.h            |  0
 71 files changed, 329 insertions(+), 499 deletions(-)
 delete mode 100644 arch/efi/Kconfig
 delete mode 100644 arch/efi/Makefile
 delete mode 100644 arch/efi/efi/Makefile
 delete mode 100644 arch/efi/include/asm/barebox.h
 delete mode 100644 arch/efi/include/asm/bitops.h
 delete mode 100644 arch/efi/include/asm/bitsperlong.h
 delete mode 100644 arch/efi/include/asm/byteorder.h
 delete mode 100644 arch/efi/include/asm/common.h
 delete mode 100644 arch/efi/include/asm/dma.h
 delete mode 100644 arch/efi/include/asm/elf.h
 delete mode 100644 arch/efi/include/asm/io.h
 delete mode 100644 arch/efi/include/asm/posix_types.h
 delete mode 100644 arch/efi/include/asm/sections.h
 delete mode 100644 arch/efi/include/asm/string.h
 delete mode 100644 arch/efi/include/asm/swab.h
 delete mode 100644 arch/efi/include/asm/types.h
 delete mode 100644 arch/efi/include/asm/unaligned.h
 delete mode 100644 arch/efi/lib/.gitignore
 delete mode 100644 arch/efi/lib/asm-offsets.c
 create mode 100644 arch/x86/bios/Makefile
 rename arch/x86/{lib => bios}/bios_disk.S (100%)
 rename arch/x86/{lib => bios}/memory16.S (100%)
 rename arch/x86/{lib => bios}/traveler.S (100%)
 rename arch/{efi => x86}/configs/efi_defconfig (98%)
 rename arch/{efi/lib => x86/mach-efi}/Makefile (100%)
 rename arch/{efi/lib => x86/mach-efi}/crt0-efi-ia32.S (100%)
 rename arch/{efi/lib => x86/mach-efi}/crt0-efi-x86_64.S (100%)
 rename arch/{efi/lib => x86/mach-efi}/elf_ia32_efi.lds.S (100%)
 rename arch/{efi/lib => x86/mach-efi}/elf_x86_64_efi.lds.S (100%)
 create mode 100644 arch/x86/mach-efi/include/mach/debug_ll.h
 rename arch/{efi/lib => x86/mach-efi}/reloc_ia32.c (100%)
 rename arch/{efi/lib => x86/mach-efi}/reloc_x86_64.c (100%)
 create mode 100644 common/efi/Makefile
 rename {arch/efi => common}/efi/efi-image.c (99%)
 rename {arch/efi => common}/efi/efi.c (99%)
 rename {arch/efi => common}/efi/env-efi/network/eth0-discover (100%)
 create mode 100644 drivers/block/Makefile
 rename {arch/efi/efi => drivers/block}/efi-block-io.c (98%)
 rename arch/efi/efi/clocksource.c => drivers/clocksource/efi.c (97%)
 create mode 100644 drivers/efi/Makefile
 rename {arch/efi => drivers}/efi/efi-device.c (93%)
 rename {arch/efi/include/mach => include/efi}/debug_ll.h (93%)
 rename {arch/efi/include/mach => include/efi}/efi-device.h (100%)
 rename {arch/efi/include/mach => include/efi}/efi.h (100%)

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#1 lore raw

PATCH 1/9 efi: move block io driver to driver/block

so it can be reused on any ARCH

---
 arch/efi/efi/Makefile                          | 5 ++++-
 drivers/Makefile                               | 1 +
 drivers/block/Makefile                         | 1 +
 {arch/efi/efi => drivers/block}/efi-block-io.c | 0
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 drivers/block/Makefile
 rename {arch/efi/efi => drivers/block}/efi-block-io.c (100%)
arch/efi/efi/Makefile +4 -1
index a856e5907..f088c7a94 100644
@@ -1,2 +1,5 @@
-obj-y += efi.o clocksource.o efi-block-io.o efi-device.o efi-image.o
+obj-y += clocksource.o
+obj-y += efi.o
+obj-y += efi-device.o
+obj-y += efi-image.o
 bbenv-y += env-efi
drivers/Makefile +1 -0
index 6a70f6ee1..9ff261ad2 100644
@@ -1,4 +1,5 @@
 obj-y	+= base/
+obj-y	+= block/
 obj-$(CONFIG_ARM_AMBA) += amba/
 obj-y	+= net/
 obj-y	+= serial/
drivers/block/Makefile new file +1 -0
new file mode 100644
index 000000000..8812c0fae
@@ -0,0 +1 @@
+obj-$(CONFIG_EFI_BOOTUP) += efi-block-io.o
drivers/block/efi-block-io.c renamed from arch/efi/efi/efi-block-io.c +0 -0
similarity index 100%
rename from arch/efi/efi/efi-block-io.c
rename to drivers/block/efi-block-io.c
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

PATCH 2/9 efi: move clocksource out of arch

as efi is not an arch but a boot mode from where barebox is started

---
 arch/efi/Kconfig                                        | 1 +
 arch/efi/efi/Makefile                                   | 1 -
 drivers/clocksource/Kconfig                             | 4 ++++
 drivers/clocksource/Makefile                            | 1 +
 arch/efi/efi/clocksource.c => drivers/clocksource/efi.c | 0
 5 files changed, 6 insertions(+), 1 deletion(-)
 rename arch/efi/efi/clocksource.c => drivers/clocksource/efi.c (100%)
arch/efi/Kconfig +1 -0
index d8d0592e5..01301c04f 100644
@@ -7,6 +7,7 @@ config ARCH_EFI
 	select EFI_DEVICEPATH
 	select PRINTF_UUID
 	select GENERIC_FIND_NEXT_BIT
+	select CLOCKSOURCE_EFI
 
 config ARCH_TEXT_BASE
 	hex
arch/efi/efi/Makefile +0 -1
index f088c7a94..51db60b88 100644
@@ -1,4 +1,3 @@
-obj-y += clocksource.o
 obj-y += efi.o
 obj-y += efi-device.o
 obj-y += efi-image.o
drivers/clocksource/Kconfig +4 -0
index f1ab554f9..ae1f10eae 100644
@@ -34,6 +34,10 @@ config CLOCKSOURCE_DUMMY_RATE
 	  The option CONFIG_CLOCKSOURCE_DUMMY_RATE is used to adjust this clocksource.
 	  The bigger rate valuest makes clocksource "faster".
 
+config CLOCKSOURCE_EFI
+	bool
+	depends on ARCH_EFI
+
 config CLOCKSOURCE_MVEBU
 	bool
 	depends on ARCH_MVEBU
drivers/clocksource/Makefile +1 -0
index 39982ffb2..e83fdeeec 100644
@@ -3,6 +3,7 @@ obj-$(CONFIG_ARM_SMP_TWD) += arm_smp_twd.o
 obj-$(CONFIG_CLOCKSOURCE_BCM283X) += bcm2835.o
 obj-$(CONFIG_CLOCKSOURCE_CLPS711X) += clps711x.o
 obj-$(CONFIG_CLOCKSOURCE_DIGIC)   += digic.o
+obj-$(CONFIG_CLOCKSOURCE_EFI) += efi.o
 obj-$(CONFIG_CLOCKSOURCE_MVEBU)   += mvebu.o
 obj-$(CONFIG_CLOCKSOURCE_NOMADIK) += nomadik.o
 obj-$(CONFIG_CLOCKSOURCE_ORION)   += orion.o
drivers/clocksource/efi.c renamed from arch/efi/efi/clocksource.c +0 -0
similarity index 100%
rename from arch/efi/efi/clocksource.c
rename to drivers/clocksource/efi.c
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw

PATCH 3/9 efi: move bus driver to driver/efi

In reply to Jean-Christophe PLAGNIOL-VILLARD
---
 arch/efi/efi/Makefile                               | 1 -
 arch/efi/efi/efi-image.c                            | 4 ++--
 arch/efi/efi/efi.c                                  | 4 ++--
 arch/efi/include/mach/debug_ll.h                    | 2 +-
 drivers/Makefile                                    | 1 +
 drivers/block/efi-block-io.c                        | 4 ++--
 drivers/clocksource/efi.c                           | 2 +-
 drivers/efi/Makefile                                | 1 +
 {arch/efi => drivers}/efi/efi-device.c              | 4 ++--
 drivers/net/efi-snp.c                               | 4 ++--
 drivers/serial/efi-stdio.c                          | 2 +-
 fs/efi.c                                            | 4 ++--
 fs/efivarfs.c                                       | 4 ++--
 {arch/efi/include/mach => include/efi}/efi-device.h | 0
 {arch/efi/include/mach => include/efi}/efi.h        | 0
 15 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 drivers/efi/Makefile
 rename {arch/efi => drivers}/efi/efi-device.c (99%)
 rename {arch/efi/include/mach => include/efi}/efi-device.h (100%)
 rename {arch/efi/include/mach => include/efi}/efi.h (100%)
arch/efi/efi/Makefile +0 -1
index 51db60b88..ef19969f9 100644
@@ -1,4 +1,3 @@
 obj-y += efi.o
-obj-y += efi-device.o
 obj-y += efi-image.o
 bbenv-y += env-efi
arch/efi/efi/efi-image.c +2 -2
index 32e060886..a37717ef8 100644
@@ -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 */
arch/efi/efi/efi.c +2 -2
index 36ac016a9..b14e1e823 100644
@@ -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;
arch/efi/include/mach/debug_ll.h +1 -1
index 0fb2cb8c2..4ca72de31 100644
@@ -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)
 {
drivers/Makefile +1 -0
index 9ff261ad2..0fadf4e44 100644
@@ -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/
drivers/block/efi-block-io.c +2 -2
index e02d3b49c..a4d9d3a95 100644
@@ -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))
drivers/clocksource/efi.c +1 -1
index c92c35b11..59fd9918a 100644
@@ -1,6 +1,6 @@
 #include <common.h>
 #include <efi.h>
-#include <mach/efi.h>
+#include <efi/efi.h>
 #include <clock.h>
 
 #ifdef __x86_64__
drivers/efi/Makefile new file +1 -0
new file mode 100644
index 000000000..de31212f2
@@ -0,0 +1 @@
+obj-y += efi-device.o
drivers/efi/efi-device.c renamed from arch/efi/efi/efi-device.c +2 -2
similarity index 99%
rename from arch/efi/efi/efi-device.c
rename to drivers/efi/efi-device.c
index 678a28399..2864d0cf1 100644
@@ -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,
drivers/net/efi-snp.c +2 -2
index 963d539db..23edc9f04 100644
@@ -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;
drivers/serial/efi-stdio.c +1 -1
index bf14c5e24..f14e719b2 100644
@@ -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
fs/efi.c +2 -2
index 7310d7d27..0c0f52e87 100644
@@ -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 */
fs/efivarfs.c +2 -2
index 86cdcf0b5..bf7351e6d 100644
@@ -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;
include/efi/efi-device.h renamed from arch/efi/include/mach/efi-device.h +0 -0
similarity index 100%
rename from arch/efi/include/mach/efi-device.h
rename to include/efi/efi-device.h
include/efi/efi.h renamed from arch/efi/include/mach/efi.h +0 -0
similarity index 100%
rename from arch/efi/include/mach/efi.h
rename to include/efi/efi.h
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#4 lore raw

PATCH 4/9 efi: move debug_ll.h to include/efi

In reply to Jean-Christophe PLAGNIOL-VILLARD

so other arch could include it too

---
 arch/efi/include/mach/debug_ll.h                  | 21 +--------------------
 {arch/efi/include/mach => include/efi}/debug_ll.h |  0
 2 files changed, 1 insertion(+), 20 deletions(-)
 copy {arch/efi/include/mach => include/efi}/debug_ll.h (100%)
arch/efi/include/mach/debug_ll.h +1 -20
index 4ca72de31..e144d86e0 100644
@@ -1,20 +1 @@
-#ifndef __MACH_DEBUG_LL_H__
-#define __MACH_DEBUG_LL_H__
-
-#define EFI_DEBUG 0
-#define EFI_DEBUG_CLEAR_MEMORY 0
-
-#include <efi.h>
-#include <efi/efi.h>
-
-static inline void PUTC_LL(char c)
-{
-	uint16_t str[2] = {};
-	struct efi_simple_text_output_protocol *con_out = efi_sys_table->con_out;
-
-	str[0] = c;
-
-	con_out->output_string(con_out, str);
-}
-
-#endif
+#include <efi/debug_ll.h>
include/efi/debug_ll.h renamed from arch/efi/include/mach/debug_ll.h +0 -0
similarity index 100%
copy from arch/efi/include/mach/debug_ll.h
copy to include/efi/debug_ll.h
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#5 lore raw

PATCH 5/9 efi: move startup and payload to common/efi

In reply to Jean-Christophe PLAGNIOL-VILLARD
---
 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%)
arch/efi/Makefile +1 -1
index b078bd0e3..90ae6ff8f 100644
@@ -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/
common/Makefile +1 -0
index 869b15a92..5f58c81d2 100644
@@ -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
common/efi/Makefile renamed from arch/efi/efi/Makefile +0 -0
similarity index 100%
rename from arch/efi/efi/Makefile
rename to common/efi/Makefile
common/efi/efi-image.c renamed from arch/efi/efi/efi-image.c +0 -0
similarity index 100%
rename from arch/efi/efi/efi-image.c
rename to common/efi/efi-image.c
common/efi/efi.c renamed from arch/efi/efi/efi.c +1 -1
similarity index 99%
rename from arch/efi/efi/efi.c
rename to common/efi/efi.c
index b14e1e823..217a6bea8 100644
@@ -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;
common/efi/env-efi/network/eth0-discover renamed from arch/efi/efi/env-efi/network/eth0-discover +0 -0
similarity index 100%
rename from arch/efi/efi/env-efi/network/eth0-discover
rename to common/efi/env-efi/network/eth0-discover
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#6 lore raw

PATCH 6/9 x86: move bios bootup code to arch/x86/bios

In reply to Jean-Christophe PLAGNIOL-VILLARD
---
 arch/x86/Makefile                  | 1 +
 arch/x86/bios/Makefile             | 3 +++
 arch/x86/{lib => bios}/bios_disk.S | 0
 arch/x86/{lib => bios}/memory16.S  | 0
 arch/x86/{lib => bios}/traveler.S  | 0
 arch/x86/lib/Makefile              | 3 ---
 6 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 arch/x86/bios/Makefile
 rename arch/x86/{lib => bios}/bios_disk.S (100%)
 rename arch/x86/{lib => bios}/memory16.S (100%)
 rename arch/x86/{lib => bios}/traveler.S (100%)
arch/x86/Makefile +1 -0
index da17d70bd..640c24b62 100644
@@ -40,6 +40,7 @@ endif
 common-y += $(BOARD) $(MACH)
 common-y += arch/x86/lib/
 common-y += arch/x86/boot/
+common-$(CONFIG_X86_BIOS_BRINGUP) += arch/x86/bios/
 
 # arch/x86/cpu/
 
arch/x86/bios/Makefile new file +3 -0
new file mode 100644
index 000000000..414ee42a4
@@ -0,0 +1,3 @@
+obj-y += memory16.o
+obj-y += traveler.o
+obj-y += bios_disk.o
arch/x86/bios/bios_disk.S renamed from arch/x86/lib/bios_disk.S +0 -0
similarity index 100%
rename from arch/x86/lib/bios_disk.S
rename to arch/x86/bios/bios_disk.S
arch/x86/bios/memory16.S renamed from arch/x86/lib/memory16.S +0 -0
similarity index 100%
rename from arch/x86/lib/memory16.S
rename to arch/x86/bios/memory16.S
arch/x86/bios/traveler.S renamed from arch/x86/lib/traveler.S +0 -0
similarity index 100%
rename from arch/x86/lib/traveler.S
rename to arch/x86/bios/traveler.S
arch/x86/lib/Makefile +0 -3
index b67629f11..6054b9e3f 100644
@@ -3,7 +3,4 @@ obj-y += memory.o
 obj-y += gdt.o
 
 # needed, when running via a 16 bit BIOS
-obj-$(CONFIG_X86_BIOS_BRINGUP) += memory16.o
-obj-$(CONFIG_X86_BIOS_BRINGUP) += traveler.o
-obj-$(CONFIG_X86_BIOS_BRINGUP) += bios_disk.o
 obj-$(CONFIG_CMD_LINUX16) += linux_start.o
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#7 lore raw

PATCH 7/9 efi: move x86 efi boot support to x86 arch

In reply to Jean-Christophe PLAGNIOL-VILLARD

prepare to drop the efi arch as efi boot up is not arch sepecific

---
 Documentation/boards/efi.rst              |   2 +-
 arch/efi/Kconfig                          |   1 +
 arch/x86/Kconfig                          |  53 +++++++++++++--
 arch/x86/Makefile                         |  74 +++++++++++++++++++--
 arch/x86/configs/efi_defconfig            |  78 ++++++++++++++++++++++
 arch/x86/configs/generic_defconfig        |   1 +
 arch/x86/include/asm/elf.h                |  86 ++++++++++++++++--------
 arch/x86/include/asm/io.h                 |  71 ++++++++++----------
 arch/x86/include/asm/types.h              |  51 +++++++++-----
 arch/x86/include/asm/unaligned.h          |   5 ++
 arch/x86/lib/Makefile                     |   2 +
 arch/x86/lib/asm-offsets.c                |   7 ++
 arch/x86/mach-efi/Makefile                |   4 ++
 arch/x86/mach-efi/crt0-efi-ia32.S         |  76 +++++++++++++++++++++
 arch/x86/mach-efi/crt0-efi-x86_64.S       |  75 +++++++++++++++++++++
 arch/x86/mach-efi/elf_ia32_efi.lds.S      | 106 ++++++++++++++++++++++++++++++
 arch/x86/mach-efi/elf_x86_64_efi.lds.S    |  99 ++++++++++++++++++++++++++++
 arch/x86/mach-efi/include/mach/debug_ll.h |   1 +
 arch/x86/mach-efi/reloc_ia32.c            |  97 +++++++++++++++++++++++++++
 arch/x86/mach-efi/reloc_x86_64.c          |  96 +++++++++++++++++++++++++++
 commands/Kconfig                          |   2 +-
 commands/edit.c                           |   2 +-
 common/Kconfig                            |   5 ++
 common/memory.c                           |   2 +-
 drivers/clocksource/Kconfig               |   2 +-
 drivers/net/Kconfig                       |   2 +-
 drivers/of/Kconfig                        |   2 +-
 drivers/serial/Kconfig                    |   2 +-
 fs/Kconfig                                |   4 +-
 include/efi.h                             |   2 +-
 30 files changed, 903 insertions(+), 107 deletions(-)
 create mode 100644 arch/x86/configs/efi_defconfig
 rewrite arch/x86/include/asm/elf.h (97%)
 create mode 100644 arch/x86/mach-efi/Makefile
 create mode 100644 arch/x86/mach-efi/crt0-efi-ia32.S
 create mode 100644 arch/x86/mach-efi/crt0-efi-x86_64.S
 create mode 100644 arch/x86/mach-efi/elf_ia32_efi.lds.S
 create mode 100644 arch/x86/mach-efi/elf_x86_64_efi.lds.S
 create mode 100644 arch/x86/mach-efi/include/mach/debug_ll.h
 create mode 100644 arch/x86/mach-efi/reloc_ia32.c
 create mode 100644 arch/x86/mach-efi/reloc_x86_64.c
Documentation/boards/efi.rst +1 -1
index b7ad40e47..ecadb3ebb 100644
@@ -25,7 +25,7 @@ Use the following to build barebox for EFI:
 
 .. code-block:: sh
 
-  export ARCH=efi
+  export ARCH=x86
   make efi_defconfig
   make
 
arch/efi/Kconfig +1 -0
index 01301c04f..01f765523 100644
@@ -3,6 +3,7 @@ config ARCH_EFI
 	default y
 	select HAS_DEBUG_LL
 	select HAS_KALLSYMS
+	select EFI_BOOTUP
 	select EFI_GUID
 	select EFI_DEVICEPATH
 	select PRINTF_UUID
arch/x86/Kconfig +46 -7

86 lines not on this page · raw message

arch/x86/Makefile +67 -7

100 lines not on this page · raw message

arch/x86/configs/efi_defconfig new file +78 -0

78 lines not on this page · raw message

arch/x86/configs/generic_defconfig +1 -0
index 5ff7f531e..3b94e02a7 100644
@@ -1,3 +1,4 @@
+CONFIG_X86_BIOS_BRINGUP=y
 CONFIG_X86_HDBOOT=y
 CONFIG_STACK_SIZE=0x7000
 CONFIG_EXPERIMENTAL=y
arch/x86/include/asm/elf.h +60 -26

86 lines not on this page · raw message

arch/x86/include/asm/io.h +33 -38

83 lines not on this page · raw message

arch/x86/include/asm/types.h +33 -18

72 lines not on this page · raw message

arch/x86/include/asm/unaligned.h +5 -0
index a7bd416b4..7e38706c5 100644
@@ -8,7 +8,12 @@
 #include <linux/unaligned/access_ok.h>
 #include <linux/unaligned/generic.h>
 
+#if __BYTE_ORDER == __LITTLE_ENDIAN
 #define get_unaligned __get_unaligned_le
 #define put_unaligned __put_unaligned_le
+#else
+#define get_unaligned __get_unaligned_be
+#define put_unaligned __put_unaligned_be
+#endif
 
 #endif /* _ASM_X86_UNALIGNED_H */
arch/x86/lib/Makefile +2 -0
index 6054b9e3f..05e43f0f2 100644
@@ -1,6 +1,8 @@
 extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds
+ifneq ($(CONFIG_X86_EFI),y)
 obj-y += memory.o
 obj-y += gdt.o
+endif
 
 # needed, when running via a 16 bit BIOS
 obj-$(CONFIG_CMD_LINUX16) += linux_start.o
arch/x86/lib/asm-offsets.c +7 -0
index b1be3e539..0f9c47eaa 100644
@@ -6,6 +6,13 @@
 
 #include <linux/kbuild.h>
 
+#ifdef CONFIG_EFI_BOOTUP
+int main(void)
+{
+	return 0;
+}
+#else
 void common(void)
 {
 }
+#endif
arch/x86/mach-efi/Makefile new file +4 -0
new file mode 100644
index 000000000..c8a97bae0
@@ -0,0 +1,4 @@
+obj-$(CONFIG_X86_64) += reloc_x86_64.o crt0-efi-x86_64.o
+obj-$(CONFIG_X86_32) += reloc_ia32.o crt0-efi-ia32.o
+extra-$(CONFIG_X86_32) += elf_ia32_efi.lds
+extra-$(CONFIG_X86_64) += elf_x86_64_efi.lds
arch/x86/mach-efi/crt0-efi-ia32.S new file +76 -0

76 lines not on this page · raw message

arch/x86/mach-efi/crt0-efi-x86_64.S new file +75 -0

75 lines not on this page · raw message

arch/x86/mach-efi/elf_ia32_efi.lds.S new file +106 -0

106 lines not on this page · raw message

arch/x86/mach-efi/elf_x86_64_efi.lds.S new file +99 -0

99 lines not on this page · raw message

arch/x86/mach-efi/include/mach/debug_ll.h new file +1 -0
new file mode 100644
index 000000000..e144d86e0
@@ -0,0 +1 @@
+#include <efi/debug_ll.h>
arch/x86/mach-efi/reloc_ia32.c new file +97 -0

97 lines not on this page · raw message

arch/x86/mach-efi/reloc_x86_64.c new file +96 -0

96 lines not on this page · raw message

commands/Kconfig +1 -1
index 21d921268..bc0885c69 100644
@@ -370,7 +370,7 @@ config CMD_BOOTZ
 
 config CMD_LINUX16
 	tristate
-	depends on X86
+	depends on X86 && !X86_EFI
 	default y if X86
 	prompt "linux16"
 	help
commands/edit.c +1 -1
index a5415a6e5..696a818d9 100644
@@ -396,7 +396,7 @@ static int do_edit(int argc, char *argv[])
 	 * down when we write to the right bottom screen position. Reduce the number
 	 * of rows by one to work around this.
 	 */
-	if (IS_ENABLED(CONFIG_ARCH_EFI))
+	if (IS_ENABLED(CONFIG_EFI_BOOTUP))
 		screenheight = 24;
 	else
 		screenheight = 25;
common/Kconfig +5 -0
index c9fe2cea7..f77a261bf 100644
@@ -81,6 +81,11 @@ config MENUTREE
 	select GLOB
 	select GLOB_SORT
 
+config EFI_BOOTUP
+	bool
+	help
+	  Efi bootup support
+
 config EFI_GUID
 	bool
 	help
common/memory.c +1 -1
index 4725f6e38..ad38b00ec 100644
@@ -67,7 +67,7 @@ void mem_malloc_init(void *start, void *end)
 	mem_malloc_initialized = 1;
 }
 
-#if !defined __SANDBOX__ && !defined CONFIG_ARCH_EFI
+#if !defined __SANDBOX__ && !defined CONFIG_EFI_BOOTUP
 static int mem_malloc_resource(void)
 {
 	/*
drivers/clocksource/Kconfig +1 -1
index ae1f10eae..54b05bbf3 100644
@@ -36,7 +36,7 @@ config CLOCKSOURCE_DUMMY_RATE
 
 config CLOCKSOURCE_EFI
 	bool
-	depends on ARCH_EFI
+	depends on EFI_BOOTUP
 
 config CLOCKSOURCE_MVEBU
 	bool
drivers/net/Kconfig +1 -1
index b723a127f..c3980e78f 100644
@@ -202,7 +202,7 @@ config DRIVER_NET_TAP
 
 config DRIVER_NET_EFI_SNP
 	bool "EFI SNP ethernet driver"
-	depends on ARCH_EFI
+	depends on EFI_BOOTUP
 
 config DRIVER_NET_TSE
 	depends on NIOS2
drivers/of/Kconfig +1 -1
index d0a62bda9..a1fac0e61 100644
@@ -4,7 +4,7 @@ config OFTREE
 
 config OFTREE_MEM_GENERIC
 	depends on OFTREE
-	depends on PPC || ARM || ARCH_EFI || OPENRISC || SANDBOX
+	depends on PPC || ARM || EFI_BOOTUP || OPENRISC || SANDBOX
 	def_bool y
 
 config DTC
drivers/serial/Kconfig +1 -1
index 4eab437ea..ced30530a 100644
@@ -46,7 +46,7 @@ config DRIVER_SERIAL_LINUX_CONSOLE
 	bool "linux console driver"
 
 config DRIVER_SERIAL_EFI_STDIO
-	depends on ARCH_EFI
+	depends on EFI_BOOTUP
 	bool "EFI stdio driver"
 
 config DRIVER_SERIAL_MPC5XXX
fs/Kconfig +2 -2
index c7c42acd7..57f2676f4 100644
@@ -42,7 +42,7 @@ config FS_NFS
 	prompt "nfs support"
 
 config FS_EFI
-	depends on ARCH_EFI
+	depends on EFI_BOOTUP
 	bool
 	prompt "EFI filesystem support"
 	help
@@ -50,7 +50,7 @@ config FS_EFI
 	  by the EFI Firmware via the EFI Simple File System Protocol.
 
 config FS_EFIVARFS
-	depends on ARCH_EFI
+	depends on EFI_BOOTUP
 	bool
 	prompt "EFI variable filesystem support (efivarfs)"
 	help
include/efi.h +1 -1
index b2e965bae..fa6fb2782 100644
@@ -14,7 +14,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 
-#ifdef CONFIG_ARCH_EFI
+#ifdef CONFIG_EFI_BOOTUP
 #define EFIAPI __attribute__((ms_abi))
 #else
 #define EFIAPI
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#8 lore raw

PATCH 8/9 ARCH: efi: Finally drop it as now we can build efi bootup from x86

In reply to Jean-Christophe PLAGNIOL-VILLARD
---
 arch/efi/Kconfig                   |  53 -------------------
 arch/efi/Makefile                  |  43 ---------------
 arch/efi/configs/efi_defconfig     |  79 ---------------------------
 arch/efi/include/asm/barebox.h     |   1 -
 arch/efi/include/asm/bitops.h      |  22 --------
 arch/efi/include/asm/bitsperlong.h |  10 ----
 arch/efi/include/asm/byteorder.h   |   8 ---
 arch/efi/include/asm/common.h      |   4 --
 arch/efi/include/asm/dma.h         |  13 -----
 arch/efi/include/asm/elf.h         |  60 ---------------------
 arch/efi/include/asm/io.h          |  55 -------------------
 arch/efi/include/asm/posix_types.h |   1 -
 arch/efi/include/asm/sections.h    |   1 -
 arch/efi/include/asm/string.h      |   1 -
 arch/efi/include/asm/swab.h        |   6 ---
 arch/efi/include/asm/types.h       |  65 -----------------------
 arch/efi/include/asm/unaligned.h   |  19 -------
 arch/efi/include/mach/debug_ll.h   |   1 -
 arch/efi/lib/.gitignore            |   2 -
 arch/efi/lib/Makefile              |   4 --
 arch/efi/lib/asm-offsets.c         |  12 -----
 arch/efi/lib/crt0-efi-ia32.S       |  76 --------------------------
 arch/efi/lib/crt0-efi-x86_64.S     |  75 --------------------------
 arch/efi/lib/elf_ia32_efi.lds.S    | 106 -------------------------------------
 arch/efi/lib/elf_x86_64_efi.lds.S  |  99 ----------------------------------
 arch/efi/lib/reloc_ia32.c          |  97 ---------------------------------
 arch/efi/lib/reloc_x86_64.c        |  96 ---------------------------------
 arch/x86/configs/efi_defconfig     |   1 +
 28 files changed, 1 insertion(+), 1009 deletions(-)
 delete mode 100644 arch/efi/Kconfig
 delete mode 100644 arch/efi/Makefile
 delete mode 100644 arch/efi/configs/efi_defconfig
 delete mode 100644 arch/efi/include/asm/barebox.h
 delete mode 100644 arch/efi/include/asm/bitops.h
 delete mode 100644 arch/efi/include/asm/bitsperlong.h
 delete mode 100644 arch/efi/include/asm/byteorder.h
 delete mode 100644 arch/efi/include/asm/common.h
 delete mode 100644 arch/efi/include/asm/dma.h
 delete mode 100644 arch/efi/include/asm/elf.h
 delete mode 100644 arch/efi/include/asm/io.h
 delete mode 100644 arch/efi/include/asm/posix_types.h
 delete mode 100644 arch/efi/include/asm/sections.h
 delete mode 100644 arch/efi/include/asm/string.h
 delete mode 100644 arch/efi/include/asm/swab.h
 delete mode 100644 arch/efi/include/asm/types.h
 delete mode 100644 arch/efi/include/asm/unaligned.h
 delete mode 100644 arch/efi/include/mach/debug_ll.h
 delete mode 100644 arch/efi/lib/.gitignore
 delete mode 100644 arch/efi/lib/Makefile
 delete mode 100644 arch/efi/lib/asm-offsets.c
 delete mode 100644 arch/efi/lib/crt0-efi-ia32.S
 delete mode 100644 arch/efi/lib/crt0-efi-x86_64.S
 delete mode 100644 arch/efi/lib/elf_ia32_efi.lds.S
 delete mode 100644 arch/efi/lib/elf_x86_64_efi.lds.S
 delete mode 100644 arch/efi/lib/reloc_ia32.c
 delete mode 100644 arch/efi/lib/reloc_x86_64.c
arch/efi/Kconfig deleted +0 -53
deleted file mode 100644
index 01f765523..000000000
@@ -1,53 +0,0 @@
-config ARCH_EFI
-	bool
-	default y
-	select HAS_DEBUG_LL
-	select HAS_KALLSYMS
-	select EFI_BOOTUP
-	select EFI_GUID
-	select EFI_DEVICEPATH
-	select PRINTF_UUID
-	select GENERIC_FIND_NEXT_BIT
-	select CLOCKSOURCE_EFI
-
-config ARCH_TEXT_BASE
-	hex
-	default 0x0
-
-menu "EFI specific settings"
-
-config 64BIT
-	def_bool y
-	help
-	  Say yes to build a 64-bit binary - formerly known as x86_64
-	  Say no to build a 32-bit binary - formerly known as i386.
-
-	  32-bit support currently does not compile and is not tested
-	  due to the lack of hardware.
-
-config X86_32
-	def_bool y
-	depends on !64BIT
-
-config X86_64
-	def_bool y
-	depends on 64BIT
-
-config ARCH_EFI_REGISTER_COM1
-	bool "Register first serial port"
-	help
-	  Say yes here to register the first serial port on ioport 0x3f8.
-	  This is useful to control barebox over a serial port if the board
-	  has one. Enabling this option may not work on boards which do not
-	  have a serial port. Also enable DRIVER_SERIAL_NS16550 to enable
-	  the NS16550 driver.
-
-endmenu
-
-source common/Kconfig
-source commands/Kconfig
-source net/Kconfig
-source drivers/Kconfig
-source fs/Kconfig
-source lib/Kconfig
-source crypto/Kconfig
arch/efi/Makefile deleted +0 -43

43 lines not on this page · raw message

arch/efi/configs/efi_defconfig deleted +0 -79

79 lines not on this page · raw message

arch/efi/include/asm/barebox.h deleted +0 -1
deleted file mode 100644
index 2997587d8..000000000
@@ -1 +0,0 @@
-/* dummy */
arch/efi/include/asm/bitops.h deleted +0 -22
deleted file mode 100644
index 447023da6..000000000
@@ -1,22 +0,0 @@
-#ifndef _SANDBOX_BITOPS_H
-#define _SANDBOX_BITOPS_H
-
-/* nothing but the defaults.. */
-#include <asm-generic/bitops/__ffs.h>
-#include <asm-generic/bitops/__fls.h>
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/ffz.h>
-#include <asm-generic/bitops/find.h>
-#include <asm-generic/bitops/fls64.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/ops.h>
-
-#define set_bit(x, y)			__set_bit(x, y)
-#define clear_bit(x, y)			__clear_bit(x, y)
-#define change_bit(x, y)		__change_bit(x, y)
-#define test_and_set_bit(x, y)		__test_and_set_bit(x, y)
-#define test_and_clear_bit(x, y)	__test_and_clear_bit(x, y)
-#define test_and_change_bit(x, y)	__test_and_change_bit(x, y)
-
-#endif
arch/efi/include/asm/bitsperlong.h deleted +0 -10
deleted file mode 100644
index 00c1fc262..000000000
@@ -1,10 +0,0 @@
-#ifndef __ASM_BITSPERLONG_H
-#define __ASM_BITSPERLONG_H
-
-#ifdef __x86_64__
-#define BITS_PER_LONG 64
-#else
-#define BITS_PER_LONG 32
-#endif
-
-#endif /* __ASM_BITSPERLONG_H */
arch/efi/include/asm/byteorder.h deleted +0 -8
deleted file mode 100644
index 37316f237..000000000
@@ -1,8 +0,0 @@
-#ifndef _I386_BYTEORDER_H
-#define _I386_BYTEORDER_H
-
-#include <asm/types.h>
-
-#include <linux/byteorder/little_endian.h>
-
-#endif /* _I386_BYTEORDER_H */
arch/efi/include/asm/common.h deleted +0 -4
deleted file mode 100644
index b0e6b7fb1..000000000
@@ -1,4 +0,0 @@
-#ifndef ASM_COMMON_H
-#define ASM_COMMON_H
-
-#endif /* ASM_COMMON_H */
arch/efi/include/asm/dma.h deleted +0 -13
deleted file mode 100644
index 459536779..000000000
@@ -1,13 +0,0 @@
-/*
- * Copyright (C) 2012 by Marc Kleine-Budde <[email protected]>
- *
- * This file is released under the GPLv2
- *
- */
-
-#ifndef __ASM_DMA_H
-#define __ASM_DMA_H
-
-/* empty*/
-
-#endif /* __ASM_DMA_H */
arch/efi/include/asm/elf.h deleted +0 -60

60 lines not on this page · raw message

arch/efi/include/asm/io.h deleted +0 -55

55 lines not on this page · raw message

arch/efi/include/asm/posix_types.h deleted +0 -1
deleted file mode 100644
index 22cae6230..000000000
@@ -1 +0,0 @@
-#include <asm-generic/posix_types.h>
arch/efi/include/asm/sections.h deleted +0 -1
deleted file mode 100644
index 2b8c51603..000000000
@@ -1 +0,0 @@
-#include <asm-generic/sections.h>
arch/efi/include/asm/string.h deleted +0 -1
deleted file mode 100644
index 2997587d8..000000000
@@ -1 +0,0 @@
-/* dummy */
arch/efi/include/asm/swab.h deleted +0 -6
deleted file mode 100644
index 60a90120b..000000000
@@ -1,6 +0,0 @@
-#ifndef _ASM_SWAB_H
-#define _ASM_SWAB_H
-
-/* nothing. use generic functions */
-
-#endif /* _ASM_SWAB_H */
arch/efi/include/asm/types.h deleted +0 -65

65 lines not on this page · raw message

arch/efi/include/asm/unaligned.h deleted +0 -19
deleted file mode 100644
index d02da6e60..000000000
@@ -1,19 +0,0 @@
-#ifndef _ASM_SANDBOX_UNALIGNED_H
-#define _ASM_SANDBOX_UNALIGNED_H
-
-/*
- * The architecture sandbox is compiled on can do unaligned accesses itself.
- */
-
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-#else
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-#endif
-
-#endif /* _ASM_SANDBOX_UNALIGNED_H */
arch/efi/include/mach/debug_ll.h deleted +0 -1
deleted file mode 100644
index e144d86e0..000000000
@@ -1 +0,0 @@
-#include <efi/debug_ll.h>
arch/efi/lib/.gitignore deleted +0 -2
deleted file mode 100644
index 847e31770..000000000
@@ -1,2 +0,0 @@
-elf_x86_64_efi.lds
-elf_ia32_efi.lds
arch/efi/lib/Makefile deleted +0 -4
deleted file mode 100644
index c8a97bae0..000000000
@@ -1,4 +0,0 @@
-obj-$(CONFIG_X86_64) += reloc_x86_64.o crt0-efi-x86_64.o
-obj-$(CONFIG_X86_32) += reloc_ia32.o crt0-efi-ia32.o
-extra-$(CONFIG_X86_32) += elf_ia32_efi.lds
-extra-$(CONFIG_X86_64) += elf_x86_64_efi.lds
arch/efi/lib/asm-offsets.c deleted +0 -12
deleted file mode 100644
index 22f382b71..000000000
@@ -1,12 +0,0 @@
-/*
- * Generate definitions needed by assembly language modules.
- * This code generates raw asm output which is post-processed to extract
- * and format the required data.
- */
-
-#include <linux/kbuild.h>
-
-int main(void)
-{
-	return 0;
-}
arch/efi/lib/crt0-efi-ia32.S deleted +0 -76

76 lines not on this page · raw message

arch/efi/lib/crt0-efi-x86_64.S deleted +0 -75

75 lines not on this page · raw message

arch/efi/lib/elf_ia32_efi.lds.S deleted +0 -106

106 lines not on this page · raw message

arch/efi/lib/elf_x86_64_efi.lds.S deleted +0 -99

99 lines not on this page · raw message

arch/efi/lib/reloc_ia32.c deleted +0 -97

97 lines not on this page · raw message

arch/efi/lib/reloc_x86_64.c deleted +0 -96

96 lines not on this page · raw message

arch/x86/configs/efi_defconfig +1 -0
index 3f7332258..0d9a44a4d 100644
@@ -20,6 +20,7 @@ CONFIG_DEBUG_LL=y
 CONFIG_LONGHELP=y
 CONFIG_CMD_IOMEM=y
 CONFIG_CMD_MEMINFO=y
+# CONFIG_CMD_LINUX16 is not set
 CONFIG_CMD_GO=y
 CONFIG_CMD_LOADB=y
 CONFIG_CMD_RESET=y
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#9 lore raw

PATCH 9/9 efi: bus: add firmware vendor and resision and tables info

In reply to Jean-Christophe PLAGNIOL-VILLARD

This alllow us to known where we boot from

---
 drivers/efi/efi-device.c | 23 +++++++++++++++++++++++
 include/efi.h            |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
drivers/efi/efi-device.c +23 -0
index 2864d0cf1..7eb94de45 100644
@@ -341,10 +341,33 @@ struct bus_type efi_bus = {
 	.remove = efi_bus_remove,
 };
 
+static void efi_businfo(struct device_d *dev)
+{
+	int i;
+
+	printf("Tables:\n");
+	for (i = 0; i < efi_sys_table->nr_tables; i++) {
+		efi_config_table_t *t = &efi_sys_table->tables[i];
+
+		printf("  %d: %pUl: %s\n", i, &t->guid,
+					efi_guid_string(&t->guid));
+	}
+}
+
 static int efi_init_devices(void)
 {
+	char *fw_vendor = NULL;
+
 	bus_register(&efi_bus);
 
+	fw_vendor = strdup_wchar_to_char((const wchar_t *)efi_sys_table->fw_vendor);
+	dev_add_param_fixed(efi_bus.dev, "fw_vendor", fw_vendor);
+	free(fw_vendor);
+
+	dev_add_param_int_ro(efi_bus.dev, "fw_revision", efi_sys_table->fw_revision, "%u");
+
+	efi_bus.dev->info = efi_businfo;
+
 	efi_register_devices();
 
 	return 0;
include/efi.h +6 -1
index fa6fb2782..4b812c9ab 100644
@@ -488,6 +488,11 @@ extern efi_guid_t efi_block_io_protocol_guid;
 extern efi_guid_t efi_barebox_vendor_guid;
 extern efi_guid_t efi_systemd_vendor_guid;
 
+typedef struct {
+	efi_guid_t guid;
+	unsigned long table;
+} efi_config_table_t;
+
 #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
 
 #define EFI_2_30_SYSTEM_TABLE_REVISION  ((2 << 16) | (30))
@@ -510,7 +515,7 @@ typedef struct {
 	efi_runtime_services_t *runtime;
 	efi_boot_services_t *boottime;
 	unsigned long nr_tables;
-	unsigned long tables;
+	efi_config_table_t *tables;
 } efi_system_table_t;
 
 typedef struct {
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#10 lore raw
In reply to Jean-Christophe PLAGNIOL-VILLARD

Hi Jean-Christophe,

Quoted 9 lines · Jean-Christophe PLAGNIOL-VILLARD

Today the EFI is build as an other ARCH when in fact it's just a boot mode

so move it back to arch/x86 for the spicific x86 part and the common to common and driver

The following changes since commit 55d29525146dcd280987dfd565bfd34f08858fb3:

ata: ide-sff: don't call free for ide_port in error path (2017-01-18 12:01:38 +0100)

Quoted 7 lines

are available in the git repository at:

git://git.jcrosoft.org/barebox.git

for you to fetch changes up to 3e07e7f43bcfb5160cc6104f06535f147222570b:

efi: bus: add firmware vendor and resision and tables info (2017-02-09 17:13:41 +0800)

The series looks sane. It's currently build-testing.

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#11 lore raw
In reply to Jean-Christophe PLAGNIOL-VILLARD

Hi Jean-Christophe,

Quoted 17 lines · Jean-Christophe PLAGNIOL-VILLARD

Today the EFI is build as an other ARCH when in fact it's just a boot mode

so move it back to arch/x86 for the spicific x86 part and the common to common and driver

The following changes since commit 55d29525146dcd280987dfd565bfd34f08858fb3:

ata: ide-sff: don't call free for ide_port in error path (2017-01-18 12:01:38 +0100)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git

for you to fetch changes up to 3e07e7f43bcfb5160cc6104f06535f147222570b:

efi: bus: add firmware vendor and resision and tables info (2017-02-09 17:13:41 +0800)

Quoted 11 lines

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (9):
efi: move block io driver to driver/block
efi: move clocksource out of arch
efi: move bus driver to driver/efi
efi: move debug_ll.h to include/efi
efi: move startup and payload to common/efi
x86: move bios bootup code to arch/x86/bios
efi: move x86 efi boot support to x86 arch
ARCH: efi: Finally drop it as now we can build efi bootup from x86
efi: bus: add firmware vendor and resision and tables info

Some problems found with this series:

- bisectability breaks in 3/9:

drivers/built-in.o: In function `efi_driver_register':
/home/sha/dude/barebox/barebox-test/include/efi/efi-device.h:38: undefined reference to efi_bus' fs/built-in.o: In function efi_driver_register':
/home/sha/dude/barebox/barebox-test/include/efi/efi-device.h:38: undefined reference to efi_bus' arch/efi/efi/built-in.o: In function efi_execute_image':
/home/sha/dude/barebox/barebox-test/arch/efi/efi/efi-image.c:162: undefined reference to efi_connect_all' /home/sha/dude/barebox/barebox-test/arch/efi/efi/efi-image.c:163: undefined reference to efi_register_devices' Makefile:756: recipe for target 'barebox' failed
make: *** [barebox] Error 1

- The end result won't compile:

arch/x86/Makefile:88: *** recipe commences before first target. Stop.

With this one fixed we get:

In file included from common/efi/env-efi.bbenv.S:1:0:
include/asm-generic/barebox.lds.h:12:30: fatal error: mach/barebox.lds.h: No such file or directory
#include <mach/barebox.lds.h>

I think you can squash most of the patches together, maybe leaving 6/9 and 9/9 as separate patches. The rest is probably hard to keep separated while maintaining bisectability

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#12 lore raw
Quoted 52 lines · Sascha Hauer

Hi Jean-Christophe,

Quoted 17 lines · Jean-Christophe PLAGNIOL-VILLARD

Today the EFI is build as an other ARCH when in fact it's just a boot mode

so move it back to arch/x86 for the spicific x86 part and the common to common and driver

The following changes since commit 55d29525146dcd280987dfd565bfd34f08858fb3:

ata: ide-sff: don't call free for ide_port in error path (2017-01-18 12:01:38 +0100)

are available in the git repository at:

git://git.jcrosoft.org/barebox.git

for you to fetch changes up to 3e07e7f43bcfb5160cc6104f06535f147222570b:

efi: bus: add firmware vendor and resision and tables info (2017-02-09 17:13:41 +0800)

Quoted 11 lines

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (9):
efi: move block io driver to driver/block
efi: move clocksource out of arch
efi: move bus driver to driver/efi
efi: move debug_ll.h to include/efi
efi: move startup and payload to common/efi
x86: move bios bootup code to arch/x86/bios
efi: move x86 efi boot support to x86 arch
ARCH: efi: Finally drop it as now we can build efi bootup from x86
efi: bus: add firmware vendor and resision and tables info

Some problems found with this series:

- bisectability breaks in 3/9:

drivers/built-in.o: In function `efi_driver_register':
/home/sha/dude/barebox/barebox-test/include/efi/efi-device.h:38: undefined reference to efi_bus' fs/built-in.o: In function efi_driver_register':
/home/sha/dude/barebox/barebox-test/include/efi/efi-device.h:38: undefined reference to efi_bus' arch/efi/efi/built-in.o: In function efi_execute_image':
/home/sha/dude/barebox/barebox-test/arch/efi/efi/efi-image.c:162: undefined reference to efi_connect_all' /home/sha/dude/barebox/barebox-test/arch/efi/efi/efi-image.c:163: undefined reference to efi_register_devices' Makefile:756: recipe for target 'barebox' failed
make: *** [barebox] Error 1

- The end result won't compile:

arch/x86/Makefile:88: *** recipe commences before first target. Stop.

With this one fixed we get:

Quoted 7 lines

In file included from common/efi/env-efi.bbenv.S:1:0:
include/asm-generic/barebox.lds.h:12:30: fatal error: mach/barebox.lds.h: No such file or directory
#include <mach/barebox.lds.h>

I think you can squash most of the patches together, maybe leaving 6/9 and 9/9 as separate patches. The rest is probably hard to keep separated while maintaining bisectability

I prefer to keep it seperated

As this allow to compare arch/efi and the new arch/x86 with efi boot before droping it.

I fix the bisecting issue in the v2

and add few patch that help to debug the efi.

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox