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/IhvDevicePathBBTest.inf | 25 +++++++------- .../IhvSimpleFileSystemBBTest.inf | 33 +++++++++++-------- .../BlackBoxTest/IhvSimpleTextInBBTest.inf | 28 ++++++++-------- .../IhvSimpleTextInputExBBTest.inf | 28 ++++++++-------- .../IhvSimpleTextOutBBTest_uefi.inf | 29 ++++++++-------- 5 files changed, 74 insertions(+), 69 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf index 47c79374..eaa9aed1 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2015 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2015, 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,12 @@ #--*/ [defines] + INF_VERSION = 0x00010005 BASE_NAME = IhvDevicePathBBTest FILE_GUID = 160EB3DB-0B8C-43f4-9FE5-459087E8B0C4 - COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeBBTestDevicePath [sources.common] DevicePathBBTestMain.c @@ -35,19 +39,12 @@ DevicePathBBTestFunction.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 = InitializeBBTestDevicePath diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf index db4079f1..778d1cc5 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2013 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2013, 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 @@ -27,9 +28,12 @@ [defines] +INF_VERSION = 0x00010005 BASE_NAME = IhvSimpleFileSystemBBTest FILE_GUID = 39E91E5F-B218-4f80-ADDC-37C0003C5326 -COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeBBTestSimpleFileSystem [sources.common] Guid.c @@ -44,20 +48,21 @@ COMPONENT_TYPE = BS_DRIVER SimpleFileSystemExBBTestFunction_FlushEx.c SimpleFileSystemExBBTestFunction_OpenEx.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=InitializeBBTestSimpleFileSystem - +[Guids] + gBlackBoxEfiFileInfoGuid + gBlackBoxEfiFileSystemInfoGuid + gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid + +[Protocols] + + diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf index 1d38720d..792488f4 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2014 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2014, 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 @@ -26,9 +27,12 @@ [defines] +INF_VERSION = 0x00010005 BASE_NAME = IhvSimpleTextInBBTest 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 @@ -39,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/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/IhvSimpleTextInputExBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/IhvSimpleTextInputExBBTest.inf index c6d0b78a..f6428ce5 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/IhvSimpleTextInputExBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextInputEx/BlackBoxTest/IhvSimpleTextInputExBBTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2014 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2014, 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,12 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = IhvSimpleTextInputExBBTest FILE_GUID = 2C92BF78-9C4F-4d72-AD7D-89A072D0701A -COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeSimpleTextInputExBBTest [sources.common] SimpleTextInputExBBTestConformance.c @@ -35,19 +39,17 @@ 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 \ No newline at end of file +[Protocols] + gBlackBoxEfiSimpleTextInputExProtocolGuid + gBlackBoxEfiDevicePathProtocolGuid + diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest/IhvSimpleTextOutBBTest_uefi.inf b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest/IhvSimpleTextOutBBTest_uefi.inf index 2e58e1c7..41a1c03a 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest/IhvSimpleTextOutBBTest_uefi.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest/IhvSimpleTextOutBBTest_uefi.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2014 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2014, 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 @@ -26,9 +27,12 @@ [defines] +INF_VERSION = 0x00010005 BASE_NAME = IhvSimpleTextOutBBTest FILE_GUID = 5A4F05F1-880B-43e2-872F-49AF48E8BCAD -COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeBBTestSimpleTextOutput [sources.common] SimpleTextOutBBTestMain_uefi.c @@ -36,20 +40,17 @@ 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
