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/SimpleTextInBBTest.inf | 27 ++++++++--------- .../BlackBoxTest/SimpleTextInputExBBTest.inf | 26 +++++++++-------- .../BlackBoxTest/SimpleTextOutBBTest_uefi.inf | 29 ++++++++++--------- 3 files changed, 44 insertions(+), 38 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf index 58f4e694..7e48b285 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.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] +INF_VERSION = 0x00010005 BASE_NAME = SimpleTextInBBTest FILE_GUID = F2B23429-F4F2-4f47-BC26-3E76B5C35DB6 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeBBTestSimpleTextIn [sources.common] SimpleTextInBBTestMain.c @@ -38,20 +43,16 @@ COMPONENT_TYPE = BS_DRIVER SimpleTextInBBTestData.c Guid.c -[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 = InitializeBBTestSimpleTextIn +[Protocols] + gBlackBoxEfiSimpleTextInProtocolGuid + gBlackBoxEfiDevicePathProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf index 4dd1ac79..dfe55525 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.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] +INF_VERSION = 0x00010005 BASE_NAME = SimpleTextInputExBBTest FILE_GUID = 2B09ED2D-8F15-4e56-A4B5-988209FA7DC4 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeSimpleTextInputExBBTest [sources.common] SimpleTextInputExBBTestConformance.c @@ -35,19 +40,16 @@ COMPONENT_TYPE = BS_DRIVER SimpleTextInputExBBTestMain.c Guid.c -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(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=InitializeSimpleTextInputExBBTest +[Protocols] + gBlackBoxEfiSimpleTextInputExProtocolGuid + gBlackBoxEfiDevicePathProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf index 48902440..7cb05933 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.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] +INF_VERSION = 0x00010005 BASE_NAME = SimpleTextOutBBTest FILE_GUID = FDD8ABEF-7BD8-4d4e-94C3-345F5084D91B COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeBBTestSimpleTextOutput [sources.common] SimpleTextOutBBTestMain_uefi.c @@ -35,20 +40,18 @@ COMPONENT_TYPE = BS_DRIVER SimpleTextOutBBTestConformance_uefi.c Guid_uefi.c -[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=InitializeBBTestSimpleTextOutput +[Protocols] + gBlackBoxEfiSimpleTextOutProtocolGuid + gBlackBoxEfiDevicePathProtocolGuid + gBlackBoxEfiGraphicsOutputProtocolGuid + -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
