From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by mx.groups.io with SMTP id smtpd.web11.88933.1684159169919891138 for ; Mon, 15 May 2023 06:59:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm2 header.b=es9sT75j; spf=pass (domain: bsdio.com, ip: 64.147.123.20, mailfrom: rebecca@bsdio.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 0E7583200910; Mon, 15 May 2023 09:59:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 15 May 2023 09:59:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding: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=fm2; t=1684159168; x= 1684245568; bh=trcLpBBc0m2jHiAleGoHrfllf1JjwR8OpCiUmHXE640=; b=e s9sT75j9/F83E8O3dIbpHJ4Q0dxhm1K41vcou/Xe6PeLdf39AiEoratzQjr5svk2 IwS2MxgCZ+vmCH5Bs6uNtvW2v/TL3k7d7T5dxdbQrQvKC+tRR5mkPFtWdSrTSlEf YI5BO8wOdaYTC97aRomAsGZtxDwMzCkRuRjAkTIn34+bKqTzDfEXiaLPRugH/Fkm VBY16pJOYPXtSfgeOz6dk5gruopIvJQWALzcTwAparDkWMqLER5hUHW8Kub1jxjm f8DGfXTf58NZAfjH5HUgeNjqPG9rT0a9OvEyow1Z8UTq4gCdN+LM0TEJCFItbQJG 2lU69dp1b8ZckpSZ1WrDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=fm1; t=1684159168; x= 1684245568; bh=trcLpBBc0m2jHiAleGoHrfllf1JjwR8OpCiUmHXE640=; b=f vKBk2foPHnn+SxTUZ/BECCRTzo/tXd2+PfJG4Lgw20SZ+mt/LgyJ1qjOHrypP7Vi ua52izdm3IEWGvM/5zXLje+TTKSQ5cvP3eBk6xR4lKqddyFeYllH+eLejjO0v96k NhGM1dapcfVUWKms0ShisIPELPpw6VkxXxpohi3lyoyL6keiAIcs1UPMztqM6uC/ +uKM7WFhfvDZvwtL5Cc3CjlCP3a4dYzAyfh7f9z2GDSiEgRbJRPpnr5O9gQaif1h 6Ii5wbiN0yb64K4oGS7vrCgGf3ePy90WvLtBD4LlVqpmZkFtnes576YNAQEJLT+8 WK6B6QvoCzfbeVWPexchA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeehjedgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 May 2023 09:59:27 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Chasel Chiu , Nate DeSimone , Sai Chaganty , Isaac Oram Cc: Rebecca Cran Subject: [PATCH edk2-platforms v2 1/2] Platform/Intel: Delete ALIGN16 macro Date: Mon, 15 May 2023 07:59:20 -0600 Message-Id: <20230515135921.3299706-2-rebecca@bsdio.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515135921.3299706-1-rebecca@bsdio.com> References: <20230515135921.3299706-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The IS_ALIGNED macro defined in PlatformBoardConfig.h conflicts with the definition from MdePkg/Include/Base.h. Since the definitions in CometlakeOpenBoardPkg and WhiskeylakeOpenBoardPkg aren't used, delete them. Signed-off-by: Rebecca Cran --- Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h | 3 --- Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h index 4d286b897ad7..10f4d8d45861 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h @@ -15,9 +15,6 @@ #include #include -#define IS_ALIGNED(addr, size) (((addr) & (size - 1)) ? 0 : 1) -#define ALIGN16(size) (IS_ALIGNED(size, 16) ? size : ((size + 16) & 0xFFF0)) - #define BOARD_CONFIG_BLOCK_PEI_PREMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_PEI_POSTMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_DXE_VERSION 0x00000001 diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h index 44b4059f8ebf..e8bd003af79c 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h @@ -15,9 +15,6 @@ #include #include -#define IS_ALIGNED(addr, size) (((addr) & (size - 1)) ? 0 : 1) -#define ALIGN16(size) (IS_ALIGNED(size, 16) ? size : ((size + 16) & 0xFFF0)) - #define BOARD_CONFIG_BLOCK_PEI_PREMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_PEI_POSTMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_DXE_VERSION 0x00000001 -- 2.39.2