[PATCH 0/12] EFI: drop arch efi

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Wed Feb 15 11:29:32 PST 2017


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 last 3 patches allow to debug EFI and prepare for more efi support

The following changes since commit b225bbf295c92263adbcec2c385c5e8d83542c72:

  i.MX: esdhc: fix imx-esdhc driver for non-OF boards (2017-02-14 08:48:34 +0100)

are available in the git repository at:

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

for you to fetch changes up to df12536f83b485c9a4ee28f78637356c6abab6f6:

  efi: add efi handle dump command (2017-02-15 07:32:24 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (12):
      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
      efi: add minor and major to the bus and display it at boot
      efi-gui: add Timestamp Protocol GUID definition
      efi: add efi handle dump command

 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/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}/.gitignore               |   0
 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     |   1 -
 arch/x86/mach-efi/include/mach/barebox.lds.h            |   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/Makefile                                         |   1 +
 common/efi-guid.c                                       |   6 ++++++
 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/Kconfig                                         |   1 +
 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/Kconfig                                     |   2 ++
 drivers/efi/Makefile                                    |   1 +
 {arch/efi => drivers}/efi/efi-device.c                  | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 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                                           |  20 ++++++++++++++++++--
 {arch/efi/include/mach => include/efi}/debug_ll.h       |   2 +-
 {arch/efi/include/mach => include/efi}/efi-device.h     |   6 +++---
 {arch/efi/include/mach => include/efi}/efi.h            |   0
 74 files changed, 525 insertions(+), 501 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/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}/.gitignore (100%)
 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 (98%)
 create mode 100644 arch/x86/mach-efi/include/mach/barebox.lds.h
 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/Kconfig
 create mode 100644 drivers/efi/Makefile
 rename {arch/efi => drivers}/efi/efi-device.c (63%)
 rename {arch/efi/include/mach => include/efi}/debug_ll.h (93%)
 rename {arch/efi/include/mach => include/efi}/efi-device.h (91%)
 rename {arch/efi/include/mach => include/efi}/efi.h (100%)

Best Regards,
J.



More information about the barebox mailing list