From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.2.42; helo=eur02-ve1-obe.outbound.protection.outlook.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20042.outbound.protection.outlook.com [40.107.2.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C7479211E2EF3 for ; Mon, 1 Apr 2019 13:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tqLHpVM6lCrTaB9Eyhb4FjiXuwiyWvwZVCFnqHgcmHQ=; b=jKjf3TlK5Q3xzLVc8oLLXaQg3mHXY1mbWRQ6vqY/YTWVTyRC2MUmETOSEWZ+COUVHe/BLMhRa5y6XMeMnc0sHlSXXJohKCZUCuKwwo8HjtdIlU1RsMANLSEFX6JE9ZsPtDItSrC6UlkO1YRBzSEaVLNN+McagSVZ5kWwgcsWXas= Received: from AM4PR08MB2788.eurprd08.prod.outlook.com (10.170.126.27) by AM4PR08MB2916.eurprd08.prod.outlook.com (10.171.191.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.15; Mon, 1 Apr 2019 20:58:16 +0000 Received: from AM4PR08MB2788.eurprd08.prod.outlook.com ([fe80::cc1a:f5ec:27c6:4136]) by AM4PR08MB2788.eurprd08.prod.outlook.com ([fe80::cc1a:f5ec:27c6:4136%3]) with mapi id 15.20.1750.021; Mon, 1 Apr 2019 20:58:16 +0000 From: Supreeth Venkatesh To: Eric Jin , "edk2-devel@lists.01.org" Thread-Topic: [edk2-test][Patch 1/1] uefi-sct/SctPkg:Fix inf/dec files for EBC test Thread-Index: AQHU5snUUDuVx+dd0kOQiraKgJ1K8aYnzVEA Date: Mon, 1 Apr 2019 20:58:15 +0000 Message-ID: References: <20190330072546.17272-1-eric.jin@intel.com> In-Reply-To: <20190330072546.17272-1-eric.jin@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Supreeth.Venkatesh@arm.com; x-originating-ip: [217.140.111.135] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5d713000-c72d-4eb3-b5bb-08d6b6e4c302 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:AM4PR08MB2916; x-ms-traffictypediagnostic: AM4PR08MB2916: x-microsoft-antispam-prvs: x-forefront-prvs: 0994F5E0C5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(376002)(39860400002)(136003)(396003)(346002)(189003)(199004)(40434004)(13464003)(53936002)(14444005)(102836004)(5660300002)(74316002)(478600001)(68736007)(7736002)(305945005)(14454004)(8936002)(110136005)(316002)(25786009)(476003)(99286004)(52536014)(486006)(2501003)(97736004)(3846002)(81166006)(66066001)(81156014)(8676002)(86362001)(446003)(6116002)(11346002)(256004)(6246003)(186003)(105586002)(2906002)(6436002)(71190400001)(26005)(71200400001)(55016002)(229853002)(33656002)(9686003)(76176011)(6506007)(5024004)(53546011)(72206003)(7696005)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR08MB2916; H:AM4PR08MB2788.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: yf+ofcQv/Qb0HwAwk5w9V4BctI004bnVpr7wX0Qpky+M960ga4/OzWjU1d/ImKDhrabzSa0dTORbAThF7zaC2yU0wfrcg10c8QIBJ+vCT4IHNDt48qQFJXsJjGdcXWt1REwfdRuu1Cb+gDqVTU3Lj2eJgE37Atlzkbab5WicwHgrKnZwPQzbUYkFRMH8UJEHhMjZltLVFFpo7tGsyxh5dAMmF7o9OKYkqmH6WNjYxLsCSVS7nBacE0f8S9Zk1UtEFgQKMO13D8oAlhJnGNEgkyVUIpk3QN3U+zbvV6ZfiiubJ8+A1hdg/uXqjmggcUVLzPgF3l4t8emDT9aKp3kssFjKZdQK0sESR2NfLREhvH/bPHuvODWLn54ybXjWnapPiHHY4fl1JoVY+9wwN3/WB/AisQT3RPrVzFDYNVPWDpQ= MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d713000-c72d-4eb3-b5bb-08d6b6e4c302 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2019 20:58:15.9026 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2916 Subject: Re: [edk2-test][Patch 1/1] uefi-sct/SctPkg:Fix inf/dec files for EBC test X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2019 20:58:20 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Supreeth Venkatesh and pushed as 6acb58dab3f5ca44c6ab5d85bcacbfb311a74631 Thanks, Supreeth -----Original Message----- From: Eric Jin Sent: Saturday, March 30, 2019 2:26 AM To: edk2-devel@lists.01.org Cc: Supreeth Venkatesh Subject: [edk2-test][Patch 1/1] uefi-sct/SctPkg:Fix inf/dec files for EBC t= est Fix compilation issues in inf files when compiled against edk2 stable tag edk2-stable201903. Cc: Supreeth Venkatesh Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Jin --- uefi-sct/SctPkg/SctPkg.dec = | 5 ++++- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependency/Ebc= DriverBin/EbcDriverBin.inf | 5 ++--- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.inf = | 40 +++++++++++++++++++++++----------------- uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependency/Ebc= DriverBin/EbcDriverBin.inf | 5 ++--- uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.i= nf | 40 +++++++++++++++++++++++----------------- 5 files changed, 54 insertions(+), 41 deletions(-) diff --git a/uefi-sct/SctPkg/SctPkg.dec b/uefi-sct/SctPkg/SctPkg.dec index = 37db1e2d161c..18e2bd2bed76 100644 --- a/uefi-sct/SctPkg/SctPkg.dec +++ b/uefi-sct/SctPkg/SctPkg.dec @@ -2,7 +2,7 @@ # # Copyright 2014 - 2015 Unified EFI, Inc.
# Copyright (c) 2014 ARM = Ltd. All rights reserved.
-# Copyright (c) 2015, Intel Corporation. Al= l rights reserved.
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights +reserved.
# # This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License @@ -32,6 +32,7 @= @ ########################################################################= ######## [Includes.common] Include # Root include for the package + Include/Legacy TestInfrastructure/SCT/Drivers/Include TestInfrastructure/SCT/Framework TestInfrastructure/SCT/Framework/Include @@ -58,3 +59,5 @@ gEfiTestProfileLibraryGuid =3D { 0x832c9023, 0x8e67, 0x453f, { 0x83, 0xe= a, 0xdf, 0x71, 0x05, 0xfa, 0x74, 0x66 }} gEfiWbTestGuid =3D { 0x0B486CED, 0x25EB, 0x448a, { 0xB2, 0xB2, 0x22, 0x4= E, 0x7A, 0x20, 0xCF, 0x57 }} gEfiEntsProtocolGuid =3D { 0x5bfcffb2, 0x84c0, 0x49f0, { 0x9a, 0x3a, 0x0= , 0x71, 0x5f, 0xec, 0xfb, 0x32 }} + gEfiPeiFlushInstructionCacheGuid =3D { 0xd8117cfc, 0x94a6, 0x11d4, { + 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }} + gEfiPeiPeCoffLoaderGuid =3D { 0xd8117cff, 0x94a6, 0x11d4, { 0x9a, 0x3a, + 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }} diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/De= pendency/EbcDriverBin/EbcDriverBin.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/= Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf index 20fed3aae997..88aa9c1f1614 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependenc= y/EbcDriverBin/EbcDriverBin.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Depend +++ ency/EbcDriverBin/EbcDriverBin.inf @@ -1,7 +1,7 @@ ## @file # # Copyright 2006 - 2012 Unified EFI, Inc.
-# Copyright (c) 2010 - 20= 12, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights +reserved.
# # This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License @@ -28,8 +28,7 @= @ [defines] BASE_NAME =3D Ebc_EbcDriver FILE_GUID =3D 8A6D92CB-4C56-4998-BC9C-E78356ED2ACD -COMPONENT_TYPE =3D BS_DRIVER -#BUILD_TYPE =3D CUSTOM_MAKEFILE +MODULE_TYPE =3D UEFI_DRIVER CUSTOM_MAKEFILE =3D MSFT| makefile CUSTOM_MAKEFILE =3D GCC | GNUmakefile diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Eb= cBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/E= bcBBTest.inf index 843409924c2e..3d2b8c7d0bcd 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest= .inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBT +++ est.inf @@ -1,7 +1,7 @@ ## @file # # Copyright 2006 - 2012 Unified EFI, Inc.
-# Copyright (c) 2010 - 20= 12, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights +reserved.
# # This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License @@ -25,9 +25,12 = @@ #--*/ [defines] -BASE_NAME =3D EbcBBTest -FILE_GUID =3D C4895001-EBD9-4521-A522-E9087DE83D39 -COMPONENT_TYPE =3D BS_DRIVER + INF_VERSION =3D 0x00010005 + BASE_NAME =3D EbcBBTest + FILE_GUID =3D C4895001-EBD9-4521-A522-E9087DE83D39 + MODULE_TYPE =3D UEFI_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D InitializeBBTestEbcProtocol [sources.common] EbcBBTestConformance.c @@ -37,20 +40,23 @@ COMPONENT_TYPE =3D BS_DRIVER Guid.c Guid.h -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/SctPkg/Include/Legacy - $(WORKSPACE)/MdePkg/Include +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec -[libraries.common] +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=3DInitializeBBTestEbcProtocol +[Guids] + gBlackBoxEfiFileInfoGuid + +[Protocols] + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiSimpleFileSystemProtocolGuid + gBlackBoxEfiEbcDriverProtocolGuid + gEfiTestProfileLibraryGuid + gEfiPeiFlushInstructionCacheGuid + gEfiPeiPeCoffLoaderGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/De= pendency/EbcDriverBin/EbcDriverBin.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/= Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf index d33a16a9f47c..2193e69389dc 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependenc= y/EbcDriverBin/EbcDriverBin.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Depend +++ ency/EbcDriverBin/EbcDriverBin.inf @@ -1,7 +1,7 @@ ## @file # # Copyright 2006 - 2015 Unified EFI, Inc.
-# Copyright (c) 2010 - 20= 15, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights +reserved.
# # This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License @@ -28,8 +28,7 @= @ [defines] BASE_NAME =3D Ebc_EbcDriver FILE_GUID =3D 8A6D92CB-4C56-4998-BC9C-E78356ED2ACD -COMPONENT_TYPE =3D BS_DRIVER -#BUILD_TYPE =3D CUSTOM_MAKEFILE +MODULE_TYPE =3D UEFI_DRIVER CUSTOM_MAKEFILE =3D MSFT | makefile CUSTOM_MAKEFILE =3D GCC | GNUmakefile diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Ih= vEbcBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTes= t/IhvEbcBBTest.inf index dfee56234626..d0b500808767 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBT= est.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbc +++ BBTest.inf @@ -1,7 +1,7 @@ ## @file # # Copyright 2006 - 2015 Unified EFI, Inc.
-# Copyright (c) 2010 - 20= 15, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights +reserved.
# # This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License @@ -25,9 +25,12 = @@ #--*/ [defines] - BASE_NAME =3D IhvEbcBBTest - FILE_GUID =3D C3776D26-7DFE-4698-A52E-422C075ACA76 - COMPONENT_TYPE =3D BS_DRIVER + INF_VERSION =3D 0x00010005 + BASE_NAME =3D IhvEbcBBTest + FILE_GUID =3D C3776D26-7DFE-4698-A52E-422C075ACA76 + MODULE_TYPE =3D UEFI_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D InitializeBBTestEbcProtocol [sources.common] EbcBBTestConformance.c @@ -37,20 +40,23 @@ Guid.c Guid.h -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/SctPkg/Include/Legacy - $(WORKSPACE)/MdePkg/Include +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec -[libraries.common] +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=3DInitializeBBTestEbcProtocol +[Guids] + gBlackBoxEfiFileInfoGuid + +[Protocols] + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiSimpleFileSystemProtocolGuid + gBlackBoxEfiEbcDriverProtocolGuid + gEfiTestProfileLibraryGuid + gEfiPeiFlushInstructionCacheGuid + gEfiPeiPeCoffLoaderGuid -- 2.20.0.windows.1 IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.