From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web10.82069.1684129419305576512 for ; Sun, 14 May 2023 22:43:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm2 header.b=OUJybhjn; spf=pass (domain: bsdio.com, ip: 64.147.123.24, mailfrom: rebecca@bsdio.com) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6ACD732008C3; Mon, 15 May 2023 01:43:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 15 May 2023 01:43:38 -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=1684129417; x= 1684215817; bh=35OoO+IW9B5IqjavoRp0jsRtz2eOmzmnz1q+dTd1/w8=; b=O UJybhjns0R4FArmAKUb5tOLmHRTgAvAHpAxgWLN3iqYPRWieSzKSYW4GLYXgRO94 4j4pcJG94oOyurLfDLSHrjtockIZC5YfpdWOwZBO1qLa/H+0f7fuoIbDvGeDmUhH 1U85+ADNsK/2UB+gPc1XVZ7nDrzyXyIgowDR6hQ0qwONJjXadEmhmwg2doG6EuMA pOdrmT30x+zAzMFh7ZUzDq6heiC7qq7mNrZXbyndHcLbmtly3HGFwRG30jXC+bF6 b62x5ve0CzBV0sVOXqKex2TsMoAgbZmnOepGTa1c016JR+/pMeECO/3RwcrgACE0 ZGXeeYmzS3T/xlEpswK2g== 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=1684129417; x= 1684215817; bh=35OoO+IW9B5IqjavoRp0jsRtz2eOmzmnz1q+dTd1/w8=; b=L bmoEMuHWj4MFVK84V/zlx5VUSkSKtkW9jOhp1rLme9HaaPGWiZmLyyzlg9a4iWgK KkGaiCS0Z3EWW/9HXfB9X8azjr67Qzi/+LVLn6x8iBxi6wtTeO+Phyoq93I1LC+L KRaQVf2cgbVcj4kqSjz9DoAwqEdwJzkyNH+WHh2Ovwjgye+9nAli6rm3B4Gtd6JA QJ8TQAnfzI9xfT2YqNqh5m3dSpY3k7171h4EhRhXyHQsEqxIM0iXw/Kiuk8svaa/ uxOkcDzJPAZmpj03SBrq68g691DyA3rH8vyb51xWbNZikUj6b+Dj+jN3Xnsy9ebx poThn3THFWPGF7Qpp5Qtw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeehiedgleekucetufdoteggodetrfdotf 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 01:43:36 -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 1/2] Platform/Intel/WhiskeylakeOpenBoardPkg: Fix ALIGN16 macro Date: Sun, 14 May 2023 23:43:28 -0600 Message-Id: <20230515054329.3224434-2-rebecca@bsdio.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515054329.3224434-1-rebecca@bsdio.com> References: <20230515054329.3224434-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. Delete it, and switch to ADDRESS_IS_ALIGNED. Signed-off-by: Rebecca Cran --- Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h index 44b4059f8ebf..4872a0afc65a 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h @@ -15,8 +15,7 @@ #include #include -#define IS_ALIGNED(addr, size) (((addr) & (size - 1)) ? 0 : 1) -#define ALIGN16(size) (IS_ALIGNED(size, 16) ? size : ((size + 16) & 0xFFF0)) +#define ALIGN16(size) (ADDRESS_IS_ALIGNED(size, 16) ? size : ((size + 16) & 0xFFF0)) #define BOARD_CONFIG_BLOCK_PEI_PREMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_PEI_POSTMEM_VERSION 0x00000001 -- 2.39.2