Fix compilation issues in inf files when compiled against edk2 stable tag edk2-stable201903.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Supreeth Venkatesh <supreeth.venkat...@arm.com> --- .../BlackBoxTest/HIIConfigAccessBBTest.inf | 30 ++++++++-------- .../BlackBoxTest/HIIConfigRoutingBBTest.inf | 27 +++++++------- .../BlackBoxTest/HIIDatabaseBBTest.inf | 32 ++++++++--------- .../HIIFont/BlackBoxTest/HIIFontBBTest.inf | 35 ++++++++++--------- .../BlackBoxTest/HIIFontExBBTest.inf | 35 ++++++++++--------- .../HIIImage/BlackBoxTest/HIIImageBBTest.inf | 34 +++++++++--------- .../BlackBoxTest/HIIImageExBBTest.inf | 28 ++++++++------- .../BlackBoxTest/HIIStringBBTest.inf | 33 ++++++++--------- 8 files changed, 133 insertions(+), 121 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf index 2ad75dbe..f962241c 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. 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,30 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = HIIConfigAccessBBTest FILE_GUID = 8253381C-3241-4a5c-AD52-BACBC4F08DE8 - COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeHIIConfigAccessBBTest [sources.common] HIIConfigAccessBBTestConformance.c HIIConfigAccessBBTestFunction.c HIIConfigAccessBBTestMain.c Guid.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIConfigAccessBBTest +[Protocols] + gBlackBoxEfiHIIConfigAccessProtocolGuid + gBlackBoxEfiHIIConfigRoutingProtocolGuid + gBlackBoxEfiDevicePathProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf index 1905c6e8..cabee0af 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. 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,31 +26,29 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = HIIConfigRoutingBBTest FILE_GUID = 113C7915-EE1F-4c2e-B95B-28C13AE3488D - COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeBBTestHIIConfigRouting [sources.common] HIIConfigRoutingBBTestConformance.c HIIConfigRoutingBBTestFunction.c HIIConfigRoutingBBTestMain.c Guid.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeBBTestHIIConfigRouting +[Protocols] diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf index 65a7cc0a..5d841ba1 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. 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 +26,13 @@ #--*/ [defines] -BASE_NAME = HIIDatabaseBBTest -FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = HIIDatabaseBBTest + FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeHIIDatabaseBBTest [sources.common] HIIDatabaseBBTestConformance.c @@ -35,20 +40,15 @@ COMPONENT_TYPE = BS_DRIVER HIIDatabaseBBTestMain.c Guid.c HIIPackageListImage.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIDatabaseBBTest +[Protocols] diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTest.inf index 0aa11795..c11356a4 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. 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 +26,13 @@ #--*/ [defines] -BASE_NAME = HIIFontBBTest -FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = HIIFontBBTest + FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeHIIFontBBTest [sources.common] HIIFontBBTestConformance.c @@ -35,20 +40,18 @@ COMPONENT_TYPE = BS_DRIVER HIIFontBBTestMain.c Guid.c HIIPackageListImage.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIFontBBTest +[Protocols] + gBlackBoxEfiGraphicsOutputProtocolGuid + gBlackBoxEfiHIIDatabaseProtocolGuid + gBlackBoxEfiHIIStringProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTest.inf index 2cf40407..298a5f92 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2017 Unified EFI, Inc.<BR> # (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR> +# Copyright (c) 2019, ARM Ltd. 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 +26,13 @@ #--*/ [defines] -BASE_NAME = HIIFontExBBTest -FILE_GUID = CD9BE3F0-CDCE-48C7-81DA-8922DEF1EE93 -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = HIIFontExBBTest + FILE_GUID = CD9BE3F0-CDCE-48C7-81DA-8922DEF1EE93 + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeHIIFontExBBTest [sources.common] HIIFontExBBTestConformance.c @@ -35,20 +40,18 @@ COMPONENT_TYPE = BS_DRIVER HIIFontExBBTestMain.c Guid.c HIIPackageListImage.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIFontExBBTest +[Protocols] + gBlackBoxEfiGraphicsOutputProtocolGuid + gBlackBoxEfiHIIDatabaseProtocolGuid + gBlackBoxEfiHIIStringProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTest.inf index a56a4ca0..26a143b6 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. 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 +26,13 @@ #--*/ [defines] -BASE_NAME = HIIImageBBTest -FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = HIIImageBBTest + FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeHIIImageBBTest [sources.common] HIIImageBBTestConformance.c @@ -35,20 +40,17 @@ COMPONENT_TYPE = BS_DRIVER HIIImageBBTestMain.c HIIPackageListImage.c Guid.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIImageBBTest +[Protocols] + gBlackBoxEfiGraphicsOutputProtocolGuid + gBlackBoxEfiHIIDatabaseProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTest.inf index b839664b..36a31f47 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2017 Unified EFI, Inc.<BR> # (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR> +# Copyright (c) 2019, ARM Ltd. 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 +26,13 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = HIIImageExBBTest FILE_GUID = 411A4B06-B913-4C50-AD8D-6A08B5B2F435 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeHIIImageExBBTest [sources.common] HIIImageExBBTestConformance.c @@ -35,20 +40,17 @@ COMPONENT_TYPE = BS_DRIVER HIIImageExBBTestMain.c HIIPackageListImage.c Guid.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIImageExBBTest +[Protocols] + gBlackBoxEfiGraphicsOutputProtocolGuid + gBlackBoxEfiHIIDatabaseProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTest.inf index 5b38bd09..eaa89e75 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. 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 +26,13 @@ #--*/ [defines] -BASE_NAME = HIIStringBBTest -FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = HIIStringBBTest + FILE_GUID = DFD885E3-75BB-441e-96BF-0360C6E3AE9F + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeHIIStringBBTest [sources.common] HIIStringBBTestConformance.c @@ -35,20 +40,16 @@ COMPONENT_TYPE = BS_DRIVER HIIStringBBTestMain.c HIIPackageListImage.c Guid.c - -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/MdePkg/Include -[libraries.common] +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - IMAGE_ENTRY_POINT=InitializeHIIStringBBTest +[Protocols] + gBlackBoxEfiHIIDatabaseProtocolGuid -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
