From nobody Mon Apr 29 07:50:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+79624+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+79624+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1629440879; cv=none; d=zohomail.com; s=zohoarc; b=mQeVXfKsix0+D0aHxnRmkKenZY3RruNX+myz83TDD2in85q7AMHTKcb26El66VpsSVPOpREVgyaDkcrdhUoOFrqxI2girRrNqHKLM2jZdSK48yQs30C6IsSd0HIzuHqQ/L6tP22YzjKQpAhcbY2+dt3t2lj374DzbZzx1SsI27M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629440879; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=HFZQqqfcaWhq+DtYThQo9s12JopIpqtC18JZWJy3kCA=; b=D1kdH+5u8pAQ6IG34UwHjKewv2dMHVxmc9Yr8voIt5d4nFgVe9ueRiGPhnkbS8k04cr0prNbQ/jL2aL8elvdTMzXlZt8r1aSHKMDUYnCNPLiQhZtmfDr6qs8Lvm7FBQK7QUGJeB2O7R57fzNB0o5riP4oT4J+zqfyoXGeNwz180= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+79624+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1629440879633728.3805083017138; Thu, 19 Aug 2021 23:27:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xVSYYY1788612xeru1q2R5wo; Thu, 19 Aug 2021 23:27:59 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.81161.1629440878511764285 for ; Thu, 19 Aug 2021 23:27:58 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="302308612" X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="302308612" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 23:27:57 -0700 X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="522923299" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 23:27:54 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You , DunTan Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build error when enable Core ci for UefiPayloadPkg Date: Fri, 20 Aug 2021 14:26:53 +0800 Message-Id: <20210820062653.714-1-dun.tan@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dun.tan@intel.com X-Gm-Message-State: cCalJZzd4N8JjdIi5jzJCIGqx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629440879; bh=MFCt+HYETEDbaWGkANnwWGRJvza8UgjO5j+4y9eYkRI=; h=Cc:Date:From:Reply-To:Subject:To; b=Tep76jkgphElTrsYfwy5pWNVXxF/eMpd7AJXBJNtkyCMiImdmHwLZkOCETzMh8m2TFd jRAdOlzatZR2KFJkjD53+uccnhWCUZ59ctAFYHVtosXf6by9KOaOq0B+ez5o+jOwIqG6w R4LyVTEfwaEOIvENWfoTgE7I9KxfgArxiQw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629440881169100001 Content-Type: text/plain; charset="utf-8" Add quotes when using $(ARCH) in .dsc and .fdf file. The quotes are added due to the way by which Core ci parse the .dsc file. Add UINTN in Hob.c to fix cast from pointer to integer of different size er= ror. Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Signed-off-by: DunTan --- UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c | 6 +++--- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- UefiPayloadPkg/UefiPayloadPkg.fdf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c b/UefiPayloadP= kg/Library/PayloadEntryHobLib/Hob.c index 768c3db770..dd25ac2682 100644 --- a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c +++ b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c @@ -77,9 +77,9 @@ HobConstructor ( Hob->Version =3D EFI_HOB_HANDOFF_TABLE_VERSION; Hob->BootMode =3D BOOT_WITH_FULL_CONFIGURATION; =20 - Hob->EfiMemoryTop =3D (EFI_PHYSICAL_ADDRESS) EfiMemoryTop; - Hob->EfiMemoryBottom =3D (EFI_PHYSICAL_ADDRESS) EfiMemoryBottom; - Hob->EfiFreeMemoryTop =3D (EFI_PHYSICAL_ADDRESS) EfiFreeMemoryTop; + Hob->EfiMemoryTop =3D (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryTop; + Hob->EfiMemoryBottom =3D (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryBot= tom; + Hob->EfiFreeMemoryTop =3D (EFI_PHYSICAL_ADDRESS) (UINTN) EfiFreeMemor= yTop; Hob->EfiFreeMemoryBottom =3D (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd+1); Hob->EfiEndOfHobList =3D (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd; =20 diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index b4a30be381..856d5ea786 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -415,7 +415,7 @@ # ##########################################################################= ###### =20 -!if "IA32" in $(ARCH) +!if "IA32" in "$(ARCH)" [Components.IA32] !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index b2cfb6b405..1c1d765517 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -202,7 +202,7 @@ INF ShellPkg/Application/Shell/Shell.inf !endif =20 !if $(SHELL_TYPE) =3D=3D MIN_BIN -!if $(ARCH) =3D=3D IA32 +!if "$(ARCH)" =3D=3D IA32 INF RuleOverride =3D BINARY USE =3D IA32 ShellBinPkg/MinUefiShell/MinUefi= Shell.inf !else INF RuleOverride =3D BINARY USE =3D X64 ShellBinPkg/MinUefiShell/MinUefiS= hell.inf @@ -210,7 +210,7 @@ INF RuleOverride =3D BINARY USE =3D X64 ShellBinPkg/Mi= nUefiShell/MinUefiShell.inf !endif =20 !if $(SHELL_TYPE) =3D=3D UEFI_BIN -!if $(ARCH) =3D=3D IA32 +!if "$(ARCH)" =3D=3D IA32 INF RuleOverride =3D BINARY USE =3D IA32 ShellBinPkg/UefiShell/UefiShell.= inf !else INF RuleOverride =3D BINARY USE =3D X64 ShellBinPkg/UefiShell/UefiShell.i= nf --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#79624): https://edk2.groups.io/g/devel/message/79624 Mute This Topic: https://groups.io/mt/85015577/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-