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> --- .../Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf | 30 +++++++++--------- .../Mtftp6ServiceBindingENTSTest.inf | 31 +++++++++---------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf index f1b2d5ce..eec7fd06 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.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,32 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Mtftp6_ENTSTest FILE_GUID = 62D93034-AC9D-443e-B6E5-D92C7A03D09A COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Mtftp6ENTSTestMain [sources.common] Mtftp6ENTSTest.c Mtftp6ENTSTestCase.c Mtftp6ENTSTestCase.h -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl - $(WORKSPACE)/MdePkg/Include +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec -[libraries.common] +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib EntsLib - BaseDebugLibNull - CompilerIntrinsicsLib -[nmake.common] - C_STD_INCLUDE= - IMAGE_ENTRY_POINT=Mtftp6ENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiMtftp6ProtocolGuid \ No newline at end of file diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf index f31626c8..318cf0ee 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.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,33 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Mtftp6ServiceBinding_ENTSTest FILE_GUID = 2D4A55D8-17E4-462e-8327-478D5BD6DA5C COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Mtftp6ServiceBindingENTSTestMain [sources.common] Mtftp6ServiceBindingENTSTest.c Mtftp6ServiceBindingENTSTestCase.h Mtftp6ServiceBindingENTSTestCase.c -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl - $(WORKSPACE)/MdePkg/Include +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec -[libraries.common] +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib EntsLib - BaseDebugLibNull - CompilerIntrinsicsLib - -[nmake.common] - C_STD_INCLUDE= - IMAGE_ENTRY_POINT=Mtftp6ServiceBindingENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiMtftp6ServiceBindingProtocolGuid -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
