There is alot of code duplication between BaseTools and MdePkg (and also MdeModulePkg). This patch series starts reducing this by removing some header files. BaseTools are switched over to use the include files in MdePkg instead. It also cleans up some (apparently) obsolete code and adapts BaseTools code in a few places to work with the MdePkg version of the include files.
v3 changes: - fix build failure on ubuntu 22.04 v2 changes: - rebase to latest master, resolve conflicts. - pick up reviews and acks. take care, Gerd Gerd Hoffmann (10): BaseTools: add BASETOOLS define MdePkg: don't set visibility to hidden for BaseTools BaseTools: remove WinNtInclude.h BaseTools: remove duplicate includes: <arch>/ProcessorBind.h BaseTools: remove duplicate includes: IndustryStandard/Acpi*.h MdePkg/PeImage.h: add bits from BaseTools version BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* BaseTools: remove duplicate includes: IndustryStandard/PeImage.h BaseTools: remove duplicate includes: IndustryStandard/*.h BaseTools/Source/C/Common/WinNtInclude.h | 66 -- BaseTools/Source/C/EfiRom/EfiRom.h | 14 +- .../Source/C/Include/AArch64/ProcessorBind.h | 148 ---- .../Source/C/Include/Arm/ProcessorBind.h | 147 ---- .../Source/C/Include/Ia32/ProcessorBind.h | 155 ---- .../Source/C/Include/IndustryStandard/Acpi.h | 117 --- .../C/Include/IndustryStandard/Acpi1_0.h | 285 ------- .../C/Include/IndustryStandard/Acpi2_0.h | 520 ------------ .../C/Include/IndustryStandard/Acpi3_0.h | 668 --------------- .../C/Include/IndustryStandard/Bluetooth.h | 56 -- .../C/Include/IndustryStandard/EfiPci.h | 51 -- ...emoryMappedConfigurationSpaceAccessTable.h | 39 - .../C/Include/IndustryStandard/PeImage.h | 789 ------------------ .../Source/C/Include/IndustryStandard/pci22.h | 536 ------------ .../Source/C/Include/IndustryStandard/pci23.h | 18 - .../Source/C/Include/IndustryStandard/pci30.h | 38 - .../C/Include/LoongArch64/ProcessorBind.h | 80 -- .../Source/C/Include/Protocol/DevicePath.h | 2 +- .../Source/C/Include/RiscV64/ProcessorBind.h | 85 -- .../Source/C/Include/X64/ProcessorBind.h | 183 ---- MdePkg/Include/IndustryStandard/PeImage.h | 31 + MdePkg/Include/X64/ProcessorBind.h | 2 +- BaseTools/Source/C/Common/BasePeCoff.c | 51 +- BaseTools/Source/C/Common/Decompress.c | 1 + BaseTools/Source/C/GenFv/GenFvInternalLib.c | 43 +- BaseTools/Source/C/GenFw/Elf32Convert.c | 8 +- BaseTools/Source/C/GenFw/Elf64Convert.c | 12 +- BaseTools/Source/C/GenFw/ElfConvert.c | 2 - BaseTools/Source/C/GenFw/GenFw.c | 18 +- BaseTools/Source/C/Makefiles/header.makefile | 18 +- BaseTools/Source/C/Makefiles/ms.common | 17 +- 31 files changed, 118 insertions(+), 4082 deletions(-) delete mode 100644 BaseTools/Source/C/Common/WinNtInclude.h delete mode 100644 BaseTools/Source/C/Include/AArch64/ProcessorBind.h delete mode 100644 BaseTools/Source/C/Include/Arm/ProcessorBind.h delete mode 100644 BaseTools/Source/C/Include/Ia32/ProcessorBind.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi2_0.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi3_0.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Bluetooth.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/EfiPci.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/PeImage.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/pci22.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/pci23.h delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/pci30.h delete mode 100644 BaseTools/Source/C/Include/LoongArch64/ProcessorBind.h delete mode 100644 BaseTools/Source/C/Include/RiscV64/ProcessorBind.h delete mode 100644 BaseTools/Source/C/Include/X64/ProcessorBind.h -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#102937): https://edk2.groups.io/g/devel/message/102937 Mute This Topic: https://groups.io/mt/98236910/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
