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/DevicePathBBTest.inf | 32 ++++++++-------- .../BlackBoxTest/DevicePathFromTextBBTest.inf | 30 +++++++++------ .../BlackBoxTest/DevicePathToTextBBTest.inf | 38 +++++++++++-------- 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf index 8d57aeab..ed214634 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.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,29 +26,26 @@ #--*/ [defines] -BASE_NAME = DevicePathBBTest -FILE_GUID = 5E1013F6-302B-4628-BB28-B5FBB3FC4843 -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = DevicePathBBTest + FILE_GUID = 5E1013F6-302B-4628-BB28-B5FBB3FC4843 + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeBBTestDevicePathProtocol [sources.common] DevicePathBBTestMain.c DevicePathBBTestMain.h DevicePathBBTestFunction.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 = InitializeBBTestDevicePathProtocol diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf index a1c074dd..3a446e5c 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.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,13 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = DevicePathFromTextBBTest FILE_GUID = 013941EE-C9B5-4c21-B10B-0C13921DA929 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = InitializeBBTestDevicePathFromTextProtocol [sources.common] DevicePathFromTextBBTestMain.c @@ -37,19 +42,20 @@ COMPONENT_TYPE = BS_DRIVER DevicePathFromTextBBTestCoverage.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 = InitializeBBTestDevicePathFromTextProtocol +[Guids] + gBlackBoxEfiPcAnsiGuid + +[Protocols] + gBlackBoxEfiDevicePathUtilitiesProtocolGuid + gBlackBoxEfiDebugPortProtocolGuid + gBlackBoxEfiDevicePathToTextProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf index 913d2c9d..5983fd34 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.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,13 @@ #--*/ [defines] -BASE_NAME = DevicePathToTextBBTest -FILE_GUID = E32C7105-E28B-4e8d-AA32-A4414DE046AE -COMPONENT_TYPE = BS_DRIVER + INF_VERSION = 0x00010005 + BASE_NAME = DevicePathToTextBBTest + FILE_GUID = E32C7105-E28B-4e8d-AA32-A4414DE046AE + COMPONENT_TYPE = BS_DRIVER + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeBBTestDevicePathToTextProtocol [sources.common] DevicePathToTextBBTestMain.c @@ -37,19 +42,22 @@ COMPONENT_TYPE = BS_DRIVER DevicePathToTextBBTestCoverage.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 = InitializeBBTestDevicePathToTextProtocol +[Protocols] + gBlackBoxEfiDebugPortProtocolGuid + gBlackBoxEfiDevicePathUtilitiesProtocolGuid + +[Guids] + gBlackBoxEfiPcAnsiGuid + gBlackBoxEfiVT100Guid + gBlackBoxEfiVT100PlusGuid + gBlackBoxEfiVTUTF8Guid -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
