Reviewed-by: Supreeth Venkatesh <supreeth.venkat...@arm.com>
and pushed as 6acb58dab3f5ca44c6ab5d85bcacbfb311a74631
Thanks,
Supreeth
-----Original Message-----
From: Eric Jin <eric....@intel.com>
Sent: Saturday, March 30, 2019 2:26 AM
To: edk2-devel@lists.01.org
Cc: Supreeth Venkatesh <supreeth.venkat...@arm.com>
Subject: [edk2-test][Patch 1/1] uefi-sct/SctPkg:Fix inf/dec files for EBC test
Fix compilation issues in inf files when compiled against
edk2 stable tag edk2-stable201903.
Cc: Supreeth Venkatesh <supreeth.venkat...@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Jin <eric....@intel.com>
---
uefi-sct/SctPkg/SctPkg.dec
| 5 ++++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/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/EbcDriverBin/EbcDriverBin.inf
| 5 ++---
uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
| 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.<BR> # Copyright (c) 2014 ARM Ltd.
All rights reserved.<BR> -# Copyright (c) 2015, Intel Corporation. All rights
reserved.<BR>
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# This program and the accompanying materials # are licensed and made
available 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 = { 0x832c9023, 0x8e67, 0x453f, { 0x83, 0xea,
0xdf, 0x71, 0x05, 0xfa, 0x74, 0x66 }}
gEfiWbTestGuid = { 0x0B486CED, 0x25EB, 0x448a, { 0xB2, 0xB2, 0x22, 0x4E,
0x7A, 0x20, 0xCF, 0x57 }}
gEfiEntsProtocolGuid = { 0x5bfcffb2, 0x84c0, 0x49f0, { 0x9a, 0x3a, 0x0,
0x71, 0x5f, 0xec, 0xfb, 0x32 }}
+ gEfiPeiFlushInstructionCacheGuid = { 0xd8117cfc, 0x94a6, 0x11d4, {
+ 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+ gEfiPeiPeCoffLoaderGuid = { 0xd8117cff, 0x94a6, 0x11d4, { 0x9a, 0x3a,
+ 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependency/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/Dependency/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.<BR> -# Copyright (c) 2010 - 2012,
Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# This program and the accompanying materials # are licensed and made
available under the terms and conditions of the BSD License @@ -28,8 +28,7 @@
[defines]
BASE_NAME = Ebc_EbcDriver
FILE_GUID = 8A6D92CB-4C56-4998-BC9C-E78356ED2ACD
-COMPONENT_TYPE = BS_DRIVER
-#BUILD_TYPE = CUSTOM_MAKEFILE
+MODULE_TYPE = UEFI_DRIVER
CUSTOM_MAKEFILE = MSFT| makefile
CUSTOM_MAKEFILE = GCC | GNUmakefile
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.inf
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.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.<BR> -# Copyright (c) 2010 - 2012,
Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# This program and the accompanying materials # are licensed and made
available under the terms and conditions of the BSD License @@ -25,9 +25,12 @@
#--*/
[defines]
-BASE_NAME = EbcBBTest
-FILE_GUID = C4895001-EBD9-4521-A522-E9087DE83D39
-COMPONENT_TYPE = BS_DRIVER
+ INF_VERSION = 0x00010005
+ BASE_NAME = EbcBBTest
+ FILE_GUID = C4895001-EBD9-4521-A522-E9087DE83D39
+ MODULE_TYPE = UEFI_DRIVER
+ VERSION_STRING = 1.0
+ ENTRY_POINT = InitializeBBTestEbcProtocol
[sources.common]
EbcBBTestConformance.c
@@ -37,20 +40,23 @@ COMPONENT_TYPE = 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=InitializeBBTestEbcProtocol
+[Guids]
+ gBlackBoxEfiFileInfoGuid
+
+[Protocols]
+ gBlackBoxEfiLoadedImageProtocolGuid
+ gBlackBoxEfiSimpleFileSystemProtocolGuid
+ gBlackBoxEfiEbcDriverProtocolGuid
+ gEfiTestProfileLibraryGuid
+ gEfiPeiFlushInstructionCacheGuid
+ gEfiPeiPeCoffLoaderGuid
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependency/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/Dependency/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.<BR> -# Copyright (c) 2010 - 2015,
Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# This program and the accompanying materials # are licensed and made
available under the terms and conditions of the BSD License @@ -28,8 +28,7 @@
[defines]
BASE_NAME = Ebc_EbcDriver
FILE_GUID = 8A6D92CB-4C56-4998-BC9C-E78356ED2ACD
-COMPONENT_TYPE = BS_DRIVER
-#BUILD_TYPE = CUSTOM_MAKEFILE
+MODULE_TYPE = UEFI_DRIVER
CUSTOM_MAKEFILE = MSFT | makefile
CUSTOM_MAKEFILE = GCC | GNUmakefile
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
index dfee56234626..d0b500808767 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.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.<BR> -# Copyright (c) 2010 - 2015,
Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# This program and the accompanying materials # are licensed and made
available under the terms and conditions of the BSD License @@ -25,9 +25,12 @@
#--*/
[defines]
- BASE_NAME = IhvEbcBBTest
- FILE_GUID = C3776D26-7DFE-4698-A52E-422C075ACA76
- COMPONENT_TYPE = BS_DRIVER
+ INF_VERSION = 0x00010005
+ BASE_NAME = IhvEbcBBTest
+ FILE_GUID = C3776D26-7DFE-4698-A52E-422C075ACA76
+ MODULE_TYPE = UEFI_DRIVER
+ VERSION_STRING = 1.0
+ ENTRY_POINT = 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=InitializeBBTestEbcProtocol
+[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
confidential and may also be privileged. If you are not the intended recipient,
please 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.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
