From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by mx.groups.io with SMTP id smtpd.web10.7630.1681474720368859886 for ; Fri, 14 Apr 2023 05:18:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=psPqK30z; spf=pass (domain: bsdio.com, ip: 64.147.123.25, mailfrom: rebecca@bsdio.com) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 9020B32008FC; Fri, 14 Apr 2023 08:18:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 14 Apr 2023 08:18:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1681474718; x=1681561118; bh=GLjLbaGYDEyWbAlHVg8cxtA0YSFMQ9aieJp YFKKs6cE=; b=psPqK30zotKnpZomgd5n0g2fvKcVnuKXQBXhqlb6Y/3e5WbLjVl SYuoDjt4Ck62VZgjxbMxSuW2D03UwuLSQE4aMDkeQyHbmhK+Drx6OoLFPH9wjr0j 82li/EsKFeULzqQsfAZFz/ajhaSe8GOLfzMRqGoQBCRcdkHpCSgg9i3PhTIBOG2g D17yhjyAX+92aK2lxKdFAHzTsynwdzT9k5Uy/KY80uizA9g42P/bijKDADAT1Zqb LmnjnYMGBurL7iRtEx3sIRrgZs4KXt4ieoKeX//VLKViAkG5bPCmSXRmWr5zC2SB U1DNnJg2fUpUm7S6q6TBfJELHJ/hLXjF1Tw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1681474718; x=1681561118; bh=GLjLbaGYDEyWbAlHVg8cxtA0YSFMQ9aieJp YFKKs6cE=; b=A5i3NEaVmuajr0aAtHSw7apucVDeqd61Mkrs1DOK37ra1K4lhvI yvgaxOnHt/mIZ3ISxOg1PxPuUQl0ncbyuhzLMW+jptWfvfb45To5zyJ1RVRRFO2/ 8Ziz7+jiW/nePU81zr1y7mFIPaMkJjQ9zRb6UQgVs5qn9xOvtfCjmwv+zt+63vtn o0GfifPe6HuYuCaMgKEkj/l/MSMId3fpFSmhdyxswtpBqMbctzsMFo4x9lnMqFUp +ty2o+3TYSDBNfKYmzCOpl8JQAOM8aFcU4iAk9FMpOaDp6wgZ1sr8gKid/M2cFar 4ouKEdLMqwOfGjmm27TKK1qPyZXM2BLOXvQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeltddggeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeehleekgfdutedugeehgeffgffhteefhffhteetfeevhefgvdejhedthfff ieffleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 14 Apr 2023 08:18:35 -0400 (EDT) Message-ID: Date: Fri, 14 Apr 2023 06:18:35 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [edk2-devel] [PATCH v4 00/10] BaseTools: remove duplicate includes. To: devel@edk2.groups.io, kraxel@redhat.com Cc: Pawel Polawski , Dongyan Qian , Sunil V L , Baoqi Zhang , Chao Li , Ard Biesheuvel , Zhiguang Liu , Liming Gao , Yuwei Chen , =?UTF-8?Q?Marvin_H=c3=a4user?= , Leif Lindholm , Michael D Kinney , Daniel Schaefer , Bob Feng , Oliver Steffen References: <20230414080250.1357004-1-kraxel@redhat.com> From: "Rebecca Cran" In-Reply-To: <20230414080250.1357004-1-kraxel@redhat.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit If it passes CI, then for the series: Reviewed-by: Rebecca Cran On 4/14/23 02:02, Gerd Hoffmann wrote: > 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. > > v4 changes: > - fix clang build failure > 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: /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 +- > BaseTools/Source/C/VfrCompile/GNUmakefile | 1 + > 32 files changed, 119 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 >