public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64.
@ 2019-03-28 23:11 Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 02/30] SctPkg: Ignore Ebc protocol test " Supreeth Venkatesh
                   ` (28 more replies)
  0 siblings, 29 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

1. Ignore Ebc protocol test cases for AArch64 temporarily.
2. Fix AARCH64_CC_FLAGS to remove direct inclusion of MdePkg/Include.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
---
 uefi-sct/SctPkg/UEFI/IHV_SCT.dsc  | 18 ++++++++++++------
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc | 17 +++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
index 586879c0..f23164f7 100644
--- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
@@ -101,7 +101,7 @@
 # 177:  "function <static function> was declared but never referenced"
   RVCT:*_*_ARM_CC_FLAGS    = --diag_remark=167 --diag_suppress=167,1295,188,550,1,68,111,177
 
-  *_*_AARCH64_CC_FLAGS         = -D EFIAARCH64 -I$(WORKSPACE)/MdePkg/Include/AArch64 $(GCC_VER_MACRO)
+  *_*_AARCH64_CC_FLAGS         = -D EFIAARCH64 $(GCC_VER_MACRO)
   GCC:*_*_AARCH64_CC_FLAGS     = -D EFIAARCH64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error
   *_*_AARCH64_VFRPP_FLAGS      = -D EFIAARCH64 $(GCC_VER_MACRO)
   *_*_AARCH64_APP_FLAGS        = -D EFIAARCH64 $(GCC_VER_MACRO)
@@ -193,12 +193,14 @@ SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo/BlackBoxTest/IhvBlockIoBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/IhvBlockIo2BBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/BusSpecificDriverOverride/BlackBoxTest/IhvBusSpecificDriverOverrideBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/IhvComponentName2BBTest.inf
+
+
 SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf
+
 SctPkg/TestCase/UEFI/IHV/Protocol/DiskIo/BlackBoxTest/IhvDiskIoBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/DiskIo2/BlackBoxTest/IhvDiskIo2BBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/IhvDriverBindingBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/IhvDriverDiagnostics2BBTest.inf
-SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/IhvPxeBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/ScsiPassThru/BlackBoxTest/IhvScsiPassThruBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/SerialIo/BlackBoxTest/IhvSerialIoBBTest.inf
@@ -220,13 +222,17 @@ SctPkg/TestCase/UEFI/IHV/Protocol/AbsolutePointer/BlackBoxTest/IhvAbsolutePointe
 SctPkg/TestCase/UEFI/IHV/Protocol/StorageSecurityCommand/BlackBoxTest/IhvStorageSecurityCommandBBTest.inf
 
 SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/IhvAdapterInfoBBTest.inf
-#
-# Dependency files for UEFI/IHV Test
-#
-SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf
+
 
 SctPkg/TestInfrastructure/SCT/Framework/Sct.inf
 
 [Components.IA32, Components.X64]
 SctPkg/TestCase/UEFI/IHV/Protocol/PlatformDriverOverride/BlackBoxTest/IhvPlatformDriverOverrideBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/PlatformToDriverConfiguration/BlackBoxTest/IhvPlatformToDriverConfigurationBBTest.inf
+SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
+#
+# Dependency files for UEFI/IHV Test
+#
+SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf
+
+
diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
index b6149cc4..3733e7c4 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
@@ -105,7 +105,7 @@
 # 177:  "function <static function> was declared but never referenced"
   RVCT:*_*_ARM_CC_FLAGS    = --diag_remark=167 --diag_suppress=167,1295,188,550,1,68,111,177
 
-  *_*_AARCH64_CC_FLAGS         = -D EFIAARCH64 -I$(WORKSPACE)/MdePkg/Include/AArch64 $(GCC_VER_MACRO)
+  *_*_AARCH64_CC_FLAGS         = -D EFIAARCH64 $(GCC_VER_MACRO)
   GCC:*_*_AARCH64_CC_FLAGS     = -D EFIAARCH64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error
   *_*_AARCH64_VFRPP_FLAGS      = -D EFIAARCH64 $(GCC_VER_MACRO)
   *_*_AARCH64_APP_FLAGS        = -D EFIAARCH64 $(GCC_VER_MACRO)
@@ -224,7 +224,7 @@ SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToText
 SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTest.inf
-SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.inf
+
 SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTest.inf
@@ -383,11 +383,6 @@ SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Uncompresse
 SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
 
-#
-# Dependency files for EBC Protocol Test
-#
-SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf
-
 #
 # Dependency files for Loaded Image Protocol Test
 #
@@ -484,4 +479,10 @@ SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
 SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
 
 [Components.IA32, Components.X64]
-  SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.inf
+SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.inf
+#
+# Dependency files for EBC Protocol Test
+#
+SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf
+SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.inf
+
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 02/30] SctPkg: Ignore Ebc protocol test for AArch64.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
@ 2019-03-28 23:11 ` Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 03/30] IHV/Protocol: Fix inf files for IHV protocol tests Supreeth Venkatesh
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

1. Modify build scripts to ignore Ebc protocol tests temporarily.
2. Cosmetic changes to fix the text when sct is generated to correctly
identify "UEFI SCT" and "IHV SCT".
3. Remove SctGuildLib as it is unused.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
---
 uefi-sct/SctPkg/CommonGenFramework.sh | 14 +++++++-------
 uefi-sct/SctPkg/UEFI/IHV_SCT.dsc      |  1 -
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc     |  1 -
 uefi-sct/SctPkg/build.sh              |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/uefi-sct/SctPkg/CommonGenFramework.sh b/uefi-sct/SctPkg/CommonGenFramework.sh
index 299f0d62..a803bdea 100755
--- a/uefi-sct/SctPkg/CommonGenFramework.sh
+++ b/uefi-sct/SctPkg/CommonGenFramework.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #  Copyright 2006 - 2017 Unified EFI, Inc.<BR>
-#  Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>
 #  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<CR>
 #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
 #
@@ -35,8 +35,6 @@ then
   rm -rf $Framework
 fi
 
-echo "Generating SCT binary"
-
 mkdir -p $Framework
 mkdir -p $Framework/Data
 mkdir -p $Framework/Dependency
@@ -109,6 +107,7 @@ CopyDependency()
 
 if [ $1 = "uefi_sct" ] 
 then 
+    echo "Generating UEFI SCT binary"
     # *********************************************
     # Copy the UEFI 2.1 Test Cases
     # *********************************************
@@ -152,7 +151,7 @@ then
     cp $ProcessorType/DiskIoBBTest.efi                         $Framework/Test/ > NUL
 #   cp $ProcessorType/DriverDiagnosticsBBTest.efi              $Framework/Test/ > NUL
 #   cp $ProcessorType/DriverConfigurationBBTest.efi            $Framework/Test/ > NUL
-    cp $ProcessorType/EbcBBTest.efi                            $Framework/Test/ > NUL
+#   cp $ProcessorType/EbcBBTest.efi                            $Framework/Test/ > NUL
     cp $ProcessorType/LoadedImageBBTest.efi                    $Framework/Test/ > NUL
     cp $ProcessorType/LoadFileBBTest.efi                       $Framework/Test/ > NUL
     cp $ProcessorType/PciIoBBTest.efi                          $Framework/Test/ > NUL
@@ -261,7 +260,7 @@ then
     CopyDependency ImageServices
     CopyDependency Decompress
     CopyDependency DeviceIo
-    CopyDependency Ebc
+#   CopyDependency Ebc
     CopyDependency LoadedImage
     CopyDependency PciIo
     CopyDependency PciRootBridgeIo
@@ -275,6 +274,7 @@ fi
 
 if [ $1 = "ihv_sct" ]
 then
+  echo "Generating IHV SCT binary"
   # *********************************************
   # Copy the EFI 1.10 Test Cases for IHV
   # *********************************************
@@ -291,7 +291,7 @@ then
 #  cp $ProcessorType/IhvDriverConfigurationBBTest.efi         $Framework/Test/ > NUL
 #  cp $ProcessorType/IhvDriverDiagnosticsBBTest.efi           $Framework/Test/ > NUL
   cp $ProcessorType/IhvDriverDiagnostics2BBTest.efi          $Framework/Test/ > NUL
-  cp $ProcessorType/IhvEbcBBTest.efi                         $Framework/Test/ > NUL
+# cp $ProcessorType/IhvEbcBBTest.efi                         $Framework/Test/ > NUL
   cp $ProcessorType/IhvPxeBaseCodeBBTest.efi                 $Framework/Test/ > NUL
 #  cp $ProcessorType/IhvScsiPassThruBBTest.efi                $Framework/Test/ > NUL
   cp $ProcessorType/IhvSerialIoBBTest.efi                    $Framework/Test/ > NUL
@@ -332,7 +332,7 @@ then
   cp $ProcessorType/IhvDiskIo2BBTest.efi                     $Framework/Test/ > NUL
 
   CopyDependency DeviceIo
-  CopyDependency Ebc
+# CopyDependency Ebc
   CopyDependency PxeBaseCode
 fi
 
diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
index f23164f7..66e9fc01 100644
--- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
@@ -113,7 +113,6 @@
 
 [Libraries]
   SctPkg/Library/SctLib/SctLib.inf
-  SctPkg/Library/SctGuidLib/SctGuidLib.inf
   SctPkg/Library/EfiTestLib/EfiTestLib.inf
 
   SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf
diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
index 3733e7c4..38daa091 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
@@ -117,7 +117,6 @@
 
 [Libraries]
   SctPkg/Library/SctLib/SctLib.inf
-  SctPkg/Library/SctGuidLib/SctGuidLib.inf
   SctPkg/Library/EfiTestLib/EfiTestLib.inf
 
   SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf
diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index c49b536b..baf28b40 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #  Copyright 2006 - 2015 Unified EFI, Inc.<BR>
-#  Copyright (c) 2011 - 2018, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2011 - 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
@@ -315,5 +315,5 @@ then
 echo Could not generate IHV SCT binary
      exit -1
 else
-echo The SCT binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
+echo The IHV binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
 fi
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 03/30] IHV/Protocol: Fix inf files for IHV protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 02/30] SctPkg: Ignore Ebc protocol test " Supreeth Venkatesh
@ 2019-03-28 23:11 ` Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 04/30] RIVL/Protocol: Fix inf files for RIVL Arp " Supreeth Venkatesh
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@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



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 04/30] RIVL/Protocol: Fix inf files for RIVL Arp protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 02/30] SctPkg: Ignore Ebc protocol test " Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 03/30] IHV/Protocol: Fix inf files for IHV protocol tests Supreeth Venkatesh
@ 2019-03-28 23:11 ` Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 05/30] RIVL/Protocol: Fix inf files for Dhcp4 " Supreeth Venkatesh
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../Arp/ArpENTSTest.inf                       | 30 +++++++++----------
 .../ArpServiceBindingENTSTest.inf             | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf
index cc38a6a1..8223072c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.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            = Arp_ENTSTest
 FILE_GUID            = 47DDDC20-08A3-44c2-BB40-D27AD2D62433
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = ArpENTSTestMain
 
 [sources.common]
   ArpENTSTest.c
   ArpENTSTestCase.h
   ArpENTSTestCase.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=ArpENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiArpProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf
index 19e24399..089690b8 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.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            = ArpServiceBinding_ENTSTest
 FILE_GUID            = 30C95D2F-093E-4a8a-81D5-D649EB73856A
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = ArpServiceBindingENTSTestMain
 
 [Sources.common]
   ArpServiceBindingENTSTest.c
   ArpServiceBindingENTSTestCase.h
   ArpServiceBindingENTSTestCase.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=ArpServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiArpServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 05/30] RIVL/Protocol: Fix inf files for Dhcp4 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (2 preceding siblings ...)
  2019-03-28 23:11 ` [edk2-test][PATCH v1 04/30] RIVL/Protocol: Fix inf files for RIVL Arp " Supreeth Venkatesh
@ 2019-03-28 23:11 ` Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 06/30] RIVL/Protocol: Fix inf files for Dhcp6 " Supreeth Venkatesh
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf    | 30 +++++++++----------
 .../Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf         | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf
index be611928..d9fc239c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Dhcp4_ENTSTest
 FILE_GUID            = 5F442A3D-AA4A-4d10-A30C-7BC57283D730
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Dhcp4ENTSTestMain
 
 [sources.common]
   Dhcp4ENTSTest.c
   Dhcp4ENTSTestCase.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=Dhcp4ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp4ProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf
index 14bad7f1..c7d0c797 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Dhcp4SB_ENTSTest
 FILE_GUID            = 5F442A3D-AA4A-4d10-A30C-7BC57283D730
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Dhcp4SBENTSTestMain
 
 [sources.common]
   Dhcp4SBENTSTest.c
   Dhcp4SBENTSTestCase.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=Dhcp4SBENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 06/30] RIVL/Protocol: Fix inf files for Dhcp6 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (3 preceding siblings ...)
  2019-03-28 23:11 ` [edk2-test][PATCH v1 05/30] RIVL/Protocol: Fix inf files for Dhcp4 " Supreeth Venkatesh
@ 2019-03-28 23:11 ` Supreeth Venkatesh
  2019-03-28 23:11 ` [edk2-test][PATCH v1 07/30] RIVL/Protocol: Fix inf files for Http " Supreeth Venkatesh
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf    | 31 +++++++++----------
 .../Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf         | 30 +++++++++---------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf
index f996834b..08ee3aa1 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Dhcp6_ENTSTest
 FILE_GUID            = E04ABBDD-135B-48db-9196-FBBE9EC48B75
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Dhcp6ENTSTestMain
 
 [sources.common]
   Dhcp6ENTSTest.c
   Dhcp6ENTSTestCase.c
 
-[includes.common]
-  .
-  ./Include
-  $(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=Dhcp6ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp6ProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf
index d64c912c..9ade3c4e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Dhcp6SB_ENTSTest
 FILE_GUID            = BCA42DFB-69BA-45da-A0D8-FCB8A6129E42
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Dhcp6SBENTSTestMain
 
 [sources.common]
   Dhcp6SBENTSTest.c
   Dhcp6SBENTSTestCase.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=Dhcp6SBENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 07/30] RIVL/Protocol: Fix inf files for Http protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (4 preceding siblings ...)
  2019-03-28 23:11 ` [edk2-test][PATCH v1 06/30] RIVL/Protocol: Fix inf files for Dhcp6 " Supreeth Venkatesh
@ 2019-03-28 23:11 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 08/30] RIVL/Protocol: Fix inf files for InternetProtocol4 tests Supreeth Venkatesh
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:11 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../RIVL/Protocol/Http/Http/HttpENTSTest.inf  | 31 +++++++++----------
 .../HttpServiceBindingENTSTest.inf            | 31 +++++++++----------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
index 0fee6e94..f750b263 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2017 Unified EFI, Inc.<BR>
 #  Copyright (c) 2017, 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            = Http_ENTSTest
 FILE_GUID            = 40BD8497-7073-47e8-8F11-E7D5C80A5280
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = HttpENTSTestMain
 
 [sources.common]
   HttpENTSTest.c
   HttpENTSTestCase.c
   HttpENTSTestCase.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=HttpENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiHttpProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
index 70d50346..e7b12c3d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2017 Unified EFI, Inc.<BR>
 #  Copyright (c) 2017, 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            = HttpServiceBinding_ENTSTest
 FILE_GUID            = FB06CDB4-10D0-45a0-A1C8-159B221088C9
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = HttpServiceBindingENTSTestMain
 
 [sources.common]
   HttpServiceBindingENTSTest.c
   HttpServiceBindingENTSTestCase.h
   HttpServiceBindingENTSTestCase.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=HttpServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiHttpServiceBindingProtocolGuid
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 08/30] RIVL/Protocol: Fix inf files for InternetProtocol4 tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (5 preceding siblings ...)
  2019-03-28 23:11 ` [edk2-test][PATCH v1 07/30] RIVL/Protocol: Fix inf files for Http " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 09/30] RIVL/Protocol: Fix inf files for Ip6 tests Supreeth Venkatesh
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../InternetProtocol4/Ip4/Ip4ENTSTest.inf     | 30 +++++++++---------
 .../Ip4Config/Ip4ConfigENTSTest.inf           | 31 +++++++++----------
 .../Ip4Config2/Ip4Config2ENTSTest.inf         | 30 +++++++++---------
 .../Ip4ServiceBindingENTSTest.inf             | 31 +++++++++----------
 4 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf
index 6604f4d8..557b5c00 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.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            = Ip4_ENTSTest
 FILE_GUID            = 9F825126-F495-4488-B784-DA04C5EC396B
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip4ENTSTestMain
 
 [sources.common]
   Ip4ENTSTest.c
   Ip4ENTSTestCase.h
   Ip4ENTSTestCase.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=Ip4ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp4ProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf
index 855ecaf9..459cf0d8 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.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            = Ip4Config_ENTSTest
 FILE_GUID            = 4EF1C1C2-4B2D-4e10-915C-1ECDF510FC8B
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip4ConfigENTSTestMain
 
 [sources.common]
   Ip4ConfigENTSTest.c
   Ip4ConfigENTSTestCase.h
   Ip4ConfigENTSTestCase.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=Ip4ConfigENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp4ConfigProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
index f34c002d..3cb00fb9 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2017 Unified EFI, Inc.<BR>
 #  Copyright (c) 2017, 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,32 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Ip4Config2_ENTSTest
 FILE_GUID            = E58B256E-E366-4BD4-B33E-92355A69639A
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip4Config2ENTSTestMain
 
 [sources.common]
   Ip4Config2ENTSTest.c
   Ip4Config2ENTSTestCase.h
   Ip4Config2ENTSTestCase.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=Ip4Config2ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp4Config2ProtocolGuid
 
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf
index e822ef47..21c2489e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.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            = Ip4ServiceBinding_ENTSTest
 FILE_GUID            = F00F1331-AB6F-46c5-BE57-3D4C2F29EDD5
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip4ServiceBindingENTSTestMain
 
 [sources.common]
   Ip4ServiceBindingENTSTest.c
   Ip4ServiceBindingENTSTestCase.h
   Ip4ServiceBindingENTSTestCase.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=Ip4ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 09/30] RIVL/Protocol: Fix inf files for Ip6 tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (6 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 08/30] RIVL/Protocol: Fix inf files for InternetProtocol4 tests Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 10/30] RIVL/Protocol: Fix inf files for Managed network protocol tests Supreeth Venkatesh
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../InternetProtocol6/Ip6/Ip6ENTSTest.inf     | 32 ++++++++---------
 .../Ip6Config/Ip6ConfigENTSTest.inf           | 34 +++++++++----------
 .../Ip6ServiceBindingENTSTest.inf             | 34 +++++++++----------
 3 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf
index a305ec1c..73a1ea53 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.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,34 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Ip6_ENTSTest
 FILE_GUID            = 22A3B176-E8B9-43b7-B130-32FE26F72739                       
-
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip6ENTSTestMain
 
 [sources.common]
   Ip6ENTSTest.c
   Ip6ENTSTestCase.h
   Ip6ENTSTestCase.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=Ip6ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp6ProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf
index 7fab578c..35346661 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.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,34 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Ip6Config_ENTSTest
-FILE_GUID            = 0280EF45-39FA-4437-BD41-1028531D654C                      
-
+FILE_GUID            = 0280EF45-39FA-4437-BD41-1028531D654C
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip6ConfigENTSTestMain
 
 [sources.common]
   Ip6ConfigENTSTest.c
   Ip6ConfigENTSTestCase.h
   Ip6ConfigENTSTestCase.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=Ip6ConfigENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp6ConfigProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf
index b816dd24..6027e14e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.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,34 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Ip6ServiceBinding_ENTSTest
-FILE_GUID            = D2AA81EA-1A54-4d17-B03D-719F5C60A6EC                       
-
+FILE_GUID            = D2AA81EA-1A54-4d17-B03D-719F5C60A6EC
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Ip6ServiceBindingENTSTestMain
 
 [sources.common]
   Ip6ServiceBindingENTSTest.c
   Ip6ServiceBindingENTSTestCase.h
   Ip6ServiceBindingENTSTestCase.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=Ip6ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp6ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 10/30] RIVL/Protocol: Fix inf files for Managed network protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (7 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 09/30] RIVL/Protocol: Fix inf files for Ip6 tests Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 11/30] RIVL/Protocol: Fix inf files for Mtftp4 " Supreeth Venkatesh
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../ManagedNetwork/MNP/MnpENTSTest.inf        | 30 +++++++++----------
 .../ManagedNetwork/MNPSB/MnpSBENTSTest.inf    | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf
index 8b35dea9..1394532b 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Mnp_ENTSTest
 FILE_GUID            = 5F442A3D-AA4A-4d10-A30C-7BC57283D730
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = MnpENTSTestMain
 
 [sources.common]
   MnpENTSTest.c
   MnpENTSTestCase.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=MnpENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiManagedNetworkProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf
index b093989e..11e903e6 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.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,30 @@
 #--*/
 
 [Defines]
+  INF_VERSION          = 0x00010005
   BASE_NAME            = MnpSB_ENTSTest
   FILE_GUID            = 5F442A3D-AA4A-4d10-A30C-7BC57283D730
   COMPONENT_TYPE       = BS_DRIVER
+  MODULE_TYPE          = UEFI_DRIVER
+  VERSION_STRING       = 1.0
+  ENTRY_POINT          = MnpSBENTSTestMain
 
 [Sources.common]
   MnpSBENTSTest.c
   MnpSBENTSTestCase.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=MnpSBENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 11/30] RIVL/Protocol: Fix inf files for Mtftp4 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (8 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 10/30] RIVL/Protocol: Fix inf files for Managed network protocol tests Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 12/30] RIVL/Protocol: Fix inf files for Mtftp6 " Supreeth Venkatesh
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf | 31 +++++++++----------
 .../Mtftp4ServiceBindingENTSTest.inf          | 31 +++++++++----------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf
index 22f3c349..ed8d1da8 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.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            = Mtftp4_ENTSTest
 FILE_GUID            = ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Mtftp4ENTSTestMain
 
 [sources.common]
   Mtftp4ENTSTest.c
   Mtftp4ENTSTestCase.c
   Mtftp4ENTSTestCase.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=Mtftp4ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiMtftp4ProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf
index 1ecf43a1..b71d3c8c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.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            = Mtftp4ServiceBinding_ENTSTest
 FILE_GUID            = ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Mtftp4ServiceBindingENTSTestMain
 
 [sources.common]
   Mtftp4ServiceBindingENTSTest.c
   Mtftp4ServiceBindingENTSTestCase.h
   Mtftp4ServiceBindingENTSTestCase.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=Mtftp4ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 12/30] RIVL/Protocol: Fix inf files for Mtftp6 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (9 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 11/30] RIVL/Protocol: Fix inf files for Mtftp4 " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 13/30] RIVL/Protocol: fix inf file for PXE protocol test Supreeth Venkatesh
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@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



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 13/30] RIVL/Protocol: fix inf file for PXE protocol test.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (10 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 12/30] RIVL/Protocol: Fix inf files for Mtftp6 " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 14/30] RIVL/Protocol: Fix inf files for Simple Network " Supreeth Venkatesh
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../PXEBaseCode/PXEBaseCodeENTSTest.inf       | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf
index f7ba8c14..034b7597 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = PXEBaseCode_ENTSTest
 FILE_GUID            = 1FCFBD59-CBC5-4b09-B1CF-5D971DE3E453
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = PXEBaseCodeENTSTestMain
 
 [sources.common]
   PXEBaseCodeENTSTest.c
   PXEBaseCodeENTSTestCase.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=PXEBaseCodeENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiPxeBaseCodeProtocolGuid
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 14/30] RIVL/Protocol: Fix inf files for Simple Network protocol test.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (11 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 13/30] RIVL/Protocol: fix inf file for PXE protocol test Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 15/30] RIVL/Protocol: Fix inf files for Tcp4 protocol tests Supreeth Venkatesh
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../SimpleNetwork/SimpleNetworkENTSTest.inf   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf
index 0e49b062..a06611da 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = SimpleNetwork_ENTSTest
 FILE_GUID            = 4D6AC4AB-BB5A-45af-8F69-3CF997CE3F96
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = SimpleNetworkENTSTestMain
 
 [sources.common]
   SimpleNetworkENTSTest.c
   SimpleNetworkENTSTestCase.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=SimpleNetworkENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiSimpleNetworkProtocolGuid
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 15/30] RIVL/Protocol: Fix inf files for Tcp4 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (12 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 14/30] RIVL/Protocol: Fix inf files for Simple Network " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 16/30] RIVL/Protocol: Fix inf file for Tcp6 " Supreeth Venkatesh
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf  | 31 +++++++++----------
 .../Tcp4ServiceBindingENTSTest.inf            | 30 +++++++++---------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf
index c9ed1f5b..446d3443 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.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            = Tcp4_ENTSTest
 FILE_GUID            = 8566CFE6-F5D2-4b35-80F6-238D07A80E01
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Tcp4ENTSTestMain
 
 [sources.common]
   Tcp4ENTSTest.c
   Tcp4ENTSTestCase.c
   Tcp4ENTSTestCase.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=Tcp4ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp4ProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf
index e449b143..95977baf 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.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,32 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Tcp4ServiceBinding_ENTSTest
 FILE_GUID            = B4C44C66-516D-47c2-88DE-93309A6245F7
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Tcp4ServiceBindingENTSTestMain
 
 [sources.common]
   Tcp4ServiceBindingENTSTest.c
   Tcp4ServiceBindingENTSTestCase.h
   Tcp4ServiceBindingENTSTestCase.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=Tcp4ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp4ServiceBindingProtocolGuid
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 16/30] RIVL/Protocol: Fix inf file for Tcp6 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (13 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 15/30] RIVL/Protocol: Fix inf files for Tcp4 protocol tests Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 17/30] RIVL/Protocol: Fix inf files for Udp4 " Supreeth Venkatesh
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf  | 30 +++++++++----------
 .../Tcp6ServiceBindingENTSTest.inf            | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf
index d7088aa5..bb692ed5 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.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            = Tcp6_ENTSTest
 FILE_GUID            = 995565A5-33C0-4f40-8298-F190BE579C29
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Tcp6ENTSTestMain
 
 [sources.common]
   Tcp6ENTSTest.c
   Tcp6ENTSTestCase.c
   Tcp6ENTSTestCase.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=Tcp6ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp6ProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf
index 5514b758..77cecff4 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.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,32 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Tcp6ServiceBinding_ENTSTest
 FILE_GUID            = 6FA66944-99EB-4415-BD1A-BE8B56949D8D
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Tcp6ServiceBindingENTSTestMain
 
 [sources.common]
   Tcp6ServiceBindingENTSTest.c
   Tcp6ServiceBindingENTSTestCase.h
   Tcp6ServiceBindingENTSTestCase.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=Tcp6ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp6ServiceBindingProtocolGuid
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 17/30] RIVL/Protocol: Fix inf files for Udp4 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (14 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 16/30] RIVL/Protocol: Fix inf file for Tcp6 " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 18/30] RIVL/Protocol: Fix inf files for Udp6 " Supreeth Venkatesh
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf  | 31 +++++++++----------
 .../Udp4ServiceBindingENTSTest.inf            | 31 +++++++++----------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf
index aedcbbcd..45a1643c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Udp4_ENTSTest
 FILE_GUID            = ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Udp4ENTSTestMain
 
 [sources.common]
   Udp4ENTSTest.c
   Udp4ENTSTestCase.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=Udp4ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp4ProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf
index 78e5176f..1a315d9c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.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            = Udp4ServiceBinding_ENTSTest
 FILE_GUID            = ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Udp4ServiceBindingENTSTestMain
 
 [sources.common]
   Udp4ServiceBindingENTSTest.c
   Udp4ServiceBindingENTSTestCase.h
   Udp4ServiceBindingENTSTestCase.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=Udp4ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 18/30] RIVL/Protocol: Fix inf files for Udp6 protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (15 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 17/30] RIVL/Protocol: Fix inf files for Udp4 " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 19/30] BootServices: Fix inf files for ImageServices dependency data files Supreeth Venkatesh
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf  | 31 +++++++++----------
 .../Udp6ServiceBindingENTSTest.inf            | 30 +++++++++---------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
index 6dbde295..359a2e42 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.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,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Udp6_ENTSTest
 FILE_GUID            = 9BDED151-34DA-4b54-890F-55CD1467A603
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Udp6ENTSTestMain
 
 [sources.common]
   Udp6ENTSTest.c
   Udp6ENTSTestCase.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=Udp6ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp6ProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
index 097c06ea..8d4da726 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.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            = Udp6ServiceBinding_ENTSTest
 FILE_GUID            = D19405F6-7886-4cb2-9334-EF1188CDC401
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Udp6ServiceBindingENTSTestMain
 
 [Sources.common]
   Udp6ServiceBindingENTSTest.c
   Udp6ServiceBindingENTSTestCase.h
   Udp6ServiceBindingENTSTestCase.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=Udp6ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp6ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 19/30] BootServices: Fix inf files for ImageServices dependency data files.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (16 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 18/30] RIVL/Protocol: Fix inf files for Udp6 " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 20/30] EFI/Protocol: Fix inf file for DebugSupport protocol test Supreeth Venkatesh
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf     | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf     | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf     | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf     | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.inf     | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.inf     | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.inf     | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf
index 57a079ad..75dfde36 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.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
@@ -41,6 +42,7 @@
 BASE_NAME            = ImageServices_InvalidImage1
 FILE_GUID            = 4113463C-D7AF-4624-8396-5FA4B3FEC062
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf
index 42302273..f3119017 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.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
@@ -28,6 +29,7 @@
 BASE_NAME            = ImageServices_InvalidImage2
 FILE_GUID            = BAE70423-9A0E-418f-8A24-B61B95C8BD33
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf
index a82ae4d9..bb70cac1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.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
@@ -28,6 +29,7 @@
 BASE_NAME            = ImageServices_InvalidImage3
 FILE_GUID            = 69CB9468-D198-4cb6-868C-5F8B7D26DE06
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf
index c5dba20d..f5bee8b0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.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
@@ -28,6 +29,7 @@
 BASE_NAME            = ImageServices_InvalidImage4
 FILE_GUID            = AE1CB3EB-7A3E-452c-A488-49998C6AC398
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.inf
index 98d09a0e..76d4001b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.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
@@ -28,6 +29,7 @@
 BASE_NAME            = ImageServices_InvalidImage5
 FILE_GUID            = 447D0171-FD47-490d-9139-53D439A600D1
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.inf
index ad39aefb..32f23037 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.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
@@ -28,6 +29,7 @@
 BASE_NAME            = ImageServices_InvalidImage6
 FILE_GUID            = AD5E04FE-7153-4fe8-98E7-DD5744203F1A
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.inf
index 669f8b10..49d692f9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.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
@@ -28,6 +29,7 @@
 BASE_NAME            = ImageServices_InvalidImage7
 FILE_GUID            = 53B9DD73-E6BF-4a70-98AF-C5B79A51BBF0
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| Makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 20/30] EFI/Protocol: Fix inf file for DebugSupport protocol test.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (17 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 19/30] BootServices: Fix inf files for ImageServices dependency data files Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 21/30] EFI/Protocol: Fix inf files for Decompress protocol dependency data Supreeth Venkatesh
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../BlackBoxTest/DebugSupportBBTest.inf       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf
index 70130de8..2a0f36c7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.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            = DebugSupportBBTest
-  FILE_GUID            = 4D72D5AB-34F3-4d47-A1CD-119B20D7371C
-  COMPONENT_TYPE       = BS_DRIVER
+  INF_VERSION      = 0x00010005
+  BASE_NAME        = DebugSupportBBTest
+  FILE_GUID        = 4D72D5AB-34F3-4d47-A1CD-119B20D7371C
+  COMPONENT_TYPE   = BS_DRIVER
+  MODULE_TYPE      = UEFI_DRIVER
+  VERSION_STRING   = 1.0
+  ENTRY_POINT      = InitializeBBTestDebugSupport
 
 [sources.common]
   DebugSupportBBTestMain.c
@@ -63,19 +68,12 @@
   Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
   Aarch64/DebugSupportBBTestCacheFunction.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 = InitializeBBTestDebugSupport
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 21/30] EFI/Protocol: Fix inf files for Decompress protocol dependency data.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (18 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 20/30] EFI/Protocol: Fix inf file for DebugSupport protocol test Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 22/30] EFI/Protocol: Fix inf files for DevicePath related protocol tests Supreeth Venkatesh
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf | 2 ++
 .../BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf | 2 ++
 .../Decompress/BlackBoxTest/Dependency/Config/Config.inf        | 2 ++
 .../InvalidCompressedFile1/InvalidCompressedFile1.inf           | 2 ++
 .../Dependency/UncompressedFile1/UncompressedFile1.inf          | 2 ++
 .../Dependency/UncompressedFile2/UncompressedFile2.inf          | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf
index 43622d7b..b4ba9f9d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.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
@@ -28,6 +29,7 @@
 BASE_NAME            = Decompress_CompressedFile1
 FILE_GUID            = E5D06136-490E-4398-AC10-C8851D43C8DC
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf
index 975aa1d6..17a52c87 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.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
@@ -28,6 +29,7 @@
 BASE_NAME            = Decompress_CompressedFile2
 FILE_GUID            = 8F93508C-F2EA-4c11-A885-99255DF1DA3C
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf
index 68aca5e9..64e62987 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.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
@@ -28,6 +29,7 @@
 BASE_NAME            = Decompress_DecompressBbTest
 FILE_GUID            = 9EE6BF79-03CD-407e-B108-96D1F5C90DA6
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
index 3a6508a1..2c0324da 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.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
@@ -28,6 +29,7 @@
 BASE_NAME            = Decompress_InvalidCompressedFile1
 FILE_GUID            = 4F667B6E-7844-45aa-AABD-A886D636D322
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile1/UncompressedFile1.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile1/UncompressedFile1.inf
index 3812c472..5068df11 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile1/UncompressedFile1.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile1/UncompressedFile1.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
@@ -28,6 +29,7 @@
 BASE_NAME            = Decompress_UncompressedFile1
 FILE_GUID            = 724A9B99-BB7F-4b8a-B81D-8F0D658F0E1C
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT | makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.inf
index def84797..674f1b45 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.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
@@ -28,6 +29,7 @@
 BASE_NAME            = Decompress_UncompressedFile2
 FILE_GUID            = E5999EE7-0E9B-4940-AA59-8C169D0746A5
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT | makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 22/30] EFI/Protocol: Fix inf files for DevicePath related protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (19 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 21/30] EFI/Protocol: Fix inf files for Decompress protocol dependency data Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 23/30] EFI/Protocol: Fix inf files for HII " Supreeth Venkatesh
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@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



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 23/30] EFI/Protocol: Fix inf files for HII related protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (20 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 22/30] EFI/Protocol: Fix inf files for DevicePath related protocol tests Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 24/30] UEFI/Protocol: Remove struct and enum in Hii defines file Supreeth Venkatesh
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@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



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 24/30] UEFI/Protocol: Remove struct and enum in Hii defines file.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (21 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 23/30] EFI/Protocol: Fix inf files for HII " Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 25/30] EFI/Protocol: Fix inf files for SimpleText protocol tests Supreeth Venkatesh
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

Fix compilation issues in definition file when compiled against edk2
stable tag edk2-stable201903 to avoid mutliple definitions of structures
and enumerations which conflict with MdePkg definitions.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
---
 uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h | 234 -------------------------
 1 file changed, 234 deletions(-)

diff --git a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
index aed64edb..f352a21e 100644
--- a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
+++ b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
@@ -41,19 +41,6 @@ typedef UINT16  EFI_DEFAULT_ID;
 typedef UINT32  EFI_HII_FONT_STYLE;
 typedef VOID    *EFI_FONT_HANDLE;
 
-//
-// HII package list
-//
-typedef struct {
-  EFI_GUID               PackageListGuid;
-  UINT32                 PackageLength;
-} EFI_HII_PACKAGE_LIST_HEADER;
-
-typedef struct {
-  UINT32                 Length:24;
-  UINT32                 Type:8;
-} EFI_HII_PACKAGE_HEADER;
-
 #define EFI_HII_PACKAGE_TYPE_ALL             0x00
 #define EFI_HII_PACKAGE_TYPE_GUID            0x01
 #define EFI_HII_PACKAGE_FORM                 0x02
@@ -80,29 +67,6 @@ typedef struct {
 #define EFI_GLYPH_NON_SPACING                0x01
 #define EFI_GLYPH_WIDE                       0x02
 
-
-typedef struct {
-  CHAR16                 UnicodeWeight;
-  UINT8                  Attributes;
-  UINT8                  GlyphCol1[EFI_GLYPH_HEIGHT];
-} EFI_NARROW_GLYPH;
-
-typedef struct {
-  CHAR16                 UnicodeWeight;
-  UINT8                  Attributes;
-  UINT8                  GlyphCol1[EFI_GLYPH_HEIGHT];
-  UINT8                  GlyphCol2[EFI_GLYPH_HEIGHT];
-  UINT8                  Pad[3];
-} EFI_WIDE_GLYPH;
-
-typedef struct _EFI_HII_SIMPLE_FONT_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER Header;
-  UINT16                 NumberOfNarrowGlyphs;
-  UINT16                 NumberOfWideGlyphs;
-  EFI_NARROW_GLYPH       *NarrowGlyphs;
-  EFI_WIDE_GLYPH         *WideGlyphs;
-} EFI_HII_SIMPLE_FONT_PACKAGE_HDR;
-
 //
 // Font Package
 //
@@ -151,14 +115,6 @@ typedef struct _EFI_FONT_DISPLAY_INFO {
   EFI_FONT_INFO                     FontInfo;
 } EFI_FONT_DISPLAY_INFO;
 
-typedef struct _EFI_HII_GLYPH_INFO {
-  UINT16                 Width;
-  UINT16                 Height;
-  INT16                  OffsetX;
-  INT16                  OffsetY;
-  INT16                  AdvanceX;
-} EFI_HII_GLYPH_INFO;
-
 typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL EFI_GRAPHICS_OUTPUT_PROTOCOL;;
 
 typedef struct _EFI_IMAGE_OUTPUT {
@@ -178,15 +134,6 @@ typedef struct _EFI_HII_ROW_INFO {
   UINTN                        BaselineOffset;
 } EFI_HII_ROW_INFO;
 
-typedef struct _EFI_HII_FONT_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER Header;
-  UINT32                 HdrSize;
-  UINT32                 GlyphBlockOffset;
-  EFI_HII_GLYPH_INFO     Cell;
-  EFI_HII_FONT_STYLE     FontStyle;
-  CHAR16                 FontFamily[1];
-} EFI_HII_FONT_PACKAGE_HDR;
-
 #define EFI_HII_GIBT_END                  0x00
 #define EFI_HII_GIBT_GLYPH                0x10
 #define EFI_HII_GIBT_GLYPHS               0x11
@@ -208,14 +155,6 @@ typedef struct _EFI_HII_DEVICE_PATH_PACKAGE {
   EFI_DEVICE_PATH_PROTOCOL *DevicePath;
 } EFI_HII_DEVICE_PATH_PACKAGE;
 
-//
-// GUID Package
-//
-typedef struct _EFI_HII_GUID_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER   Header;
-  EFI_GUID                 Guid;
-} EFI_HII_GUID_PACKAGE_HDR;
-
 //
 // String Package
 //
@@ -223,20 +162,6 @@ typedef struct _EFI_HII_GUID_PACKAGE_HDR {
 #define UEFI_CONFIG_LANG       L"x-UEFI"
 #define UEFI_CONFIG_LANG2      L"x-i-UEFI"     // BUGBUG, spec need to be updated.
 
-typedef struct _EFI_HII_STRING_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER  Header;
-  UINT32                  HdrSize;
-  UINT32                  StringInfoOffset;
-  CHAR16                  LanguageWindow[16];
-  EFI_STRING_ID           LanguageName;
-  CHAR8                   Language[1];
-} EFI_HII_STRING_PACKAGE_HDR;
-
-typedef struct {
-  UINT8                   BlockType;
-  //UINT8                 BlockBody[];
-} EFI_HII_STRING_BLOCK;
-
 #define EFI_HII_SIBT_END                     0x00
 #define EFI_HII_SIBT_STRING_SCSU             0x10
 #define EFI_HII_SIBT_STRING_SCSU_FONT        0x11
@@ -258,16 +183,6 @@ typedef struct {
 // Image Packages
 //
 
-typedef struct _EFI_HII_IMAGE_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER       Header;
-  UINT32                       ImageInfoOffset;
-  UINT32                       PaletteInfoOffset;
-} EFI_HII_IMAGE_PACKAGE_HDR;
-
-typedef struct _EFI_HII_IMAGE_BLOCK {
-  UINT8                        BlockType;
-} EFI_HII_IMAGE_BLOCK;
-
 #define EFI_IMAGE_TRANSPARENT          0x00000001
 
 typedef struct _EFI_IMAGE_INPUT {
@@ -306,29 +221,6 @@ typedef UINT32    EFI_HII_DRAW_FLAGS;
 // Forms Package
 //
 
-typedef struct {
-  UINT8 Hour;
-  UINT8 Minute;
-  UINT8 Second;
-} EFI_HII_TIME;
-
-typedef struct {
-  UINT16 Year;
-  UINT8  Month;
-  UINT8  Day;
-} EFI_HII_DATE;
-
-typedef union {
-  UINT8           u8;
-  UINT16          u16;
-  UINT32          u32;
-  UINT64          u64;
-  BOOLEAN         b;
-  EFI_HII_TIME    time;
-  EFI_HII_DATE    date;
-  EFI_STRING_ID   string;
-} EFI_IFR_TYPE_VALUE;
-
 #define EFI_IFR_FORM_OP                0x01
 #define EFI_IFR_SUBTITLE_OP            0x02
 #define EFI_IFR_TEXT_OP                0x03
@@ -437,114 +329,6 @@ EFI_STATUS
   IN EFI_HII_DATABASE_NOTIFY_TYPE    NotifyType
 );
 
-typedef enum {    
-  EfiKeyLCtrl,    
-  EfiKeyA0,       
-  EfiKeyLAlt, 
-  EfiKeySpaceBar,
-  EfiKeyA2, 
-  EfiKeyA3, 
-  EfiKeyA4, 
-  EfiKeyRCtrl, 
-  EfiKeyLeftArrow,
-  EfiKeyDownArrow, 
-  EfiKeyRightArrow, 
-  EfiKeyZero,
-  EfiKeyPeriod, 
-  EfiKeyEnter, 
-  EfiKeyLShift, 
-  EfiKeyB0,
-  EfiKeyB1, 
-  EfiKeyB2, 
-  EfiKeyB3, 
-  EfiKeyB4, 
-  EfiKeyB5, 
-  EfiKeyB6,
-  EfiKeyB7, 
-  EfiKeyB8, 
-  EfiKeyB9, 
-  EfiKeyB10, 
-  EfiKeyRshift,
-  EfiKeyUpArrow, 
-  EfiKeyOne, 
-  EfiKeyTwo, 
-  EfiKeyThree,
-  EfiKeyCapsLock, 
-  EfiKeyC1, 
-  EfiKeyC2, 
-  EfiKeyC3, 
-  EfiKeyC4,
-  EfiKeyC5, 
-  EfiKeyC6, 
-  EfiKeyC7, 
-  EfiKeyC8, 
-  EfiKeyC9,
-  EfiKeyC10, 
-  EfiKeyC11, 
-  EfiKeyC12, 
-  EfiKeyFour, 
-  EfiKeyFive,
-  EfiKeySix, 
-  EfiKeyPlus, 
-  EfiKeyTab, 
-  EfiKeyD1, 
-  EfiKeyD2,
-  EfiKeyD3, 
-  EfiKeyD4, 
-  EfiKeyD5, 
-  EfiKeyD6, 
-  EfiKeyD7, 
-  EfiKeyD8,
-  EfiKeyD9, 
-  EfiKeyD10, 
-  EfiKeyD11, 
-  EfiKeyD12, 
-  EfiKeyD13,
-  EfiKeyDel, 
-  EfiKeyEnd, 
-  EfiKeyPgDn, 
-  EfiKeySeven, 
-  EfiKeyEight,
-  EfiKeyNine, 
-  EfiKeyE0, 
-  EfiKeyE1, 
-  EfiKeyE2,
-  EfiKeyE3,
-  EfiKeyE4, 
-  EfiKeyE5, 
-  EfiKeyE6, 
-  EfiKeyE7, 
-  EfiKeyE8, 
-  EfiKeyE9,
-  EfiKeyE10, 
-  EfiKeyE11, 
-  EfiKeyE12, 
-  EfiKeyBackSpace,
-  EfiKeyIns, 
-  EfiKeyHome, 
-  EfiKeyPgUp, 
-  EfiKeyNLck, 
-  EfiKeySlash,
-  EfiKeyAsterisk, 
-  EfiKeyMinus, 
-  EfiKeyEsc, 
-  EfiKeyF1, 
-  EfiKeyF2,
-  EfiKeyF3, 
-  EfiKeyF4, 
-  EfiKeyF5, 
-  EfiKeyF6, 
-  EfiKeyF7, 
-  EfiKeyF8,
-  EfiKeyF9, 
-  EfiKeyF10, 
-  EfiKeyF11, 
-  EfiKeyF12, 
-  EfiKeyPrint,
-  EfiKeySLck, 
-  EfiKeyPause
-} EFI_KEY;
-
 #define EFI_NULL_MODIFIER                  0x0000
 #define EFI_LEFT_CONTROL_MODIFIER          0x0001
 #define EFI_RIGHT_CONTROL_MODIFIER         0x0002
@@ -580,22 +364,4 @@ typedef enum {
 #define EFI_FUNCTION_KEY_ELEVEN_MODIFIER   0x0020
 #define EFI_FUNCTION_KEY_TWELVE_MODIFIER   0x0021
 
-typedef struct {
-  EFI_KEY               Key;
-  CHAR16                Unicode; 
-  CHAR16                ShiftedUnicode;
-  CHAR16                AltGrUnicode; 
-  CHAR16                ShiftedAltGrUnicode; 
-  UINT16                Modifier;
-  UINT16                AffectedAttribute;
-} EFI_KEY_DESCRIPTOR;
-
-typedef struct {
-  UINT16                  LayoutLength;
-  EFI_GUID                Guid;
-  UINT32                  LayoutDescriptorStringOffset;       
-  UINT8                   DescriptorCount;
-  EFI_KEY_DESCRIPTOR      Descriptors[1];
-} EFI_HII_KEYBOARD_LAYOUT;
-
 #endif
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 25/30] EFI/Protocol: Fix inf files for SimpleText protocol tests.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (22 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 24/30] UEFI/Protocol: Remove struct and enum in Hii defines file Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 26/30] EFI/Protocol: Fix inf files for Pci protocol related dependency data Supreeth Venkatesh
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@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



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 26/30] EFI/Protocol: Fix inf files for Pci protocol related dependency data.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (23 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 25/30] EFI/Protocol: Fix inf files for SimpleText protocol tests Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 27/30] EFI/Protocol: Fix inf file for LoadedImage protocol test Supreeth Venkatesh
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf   | 3 ++-
 .../PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf
index 8e0e2299..f9ebca7d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.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
@@ -28,7 +29,7 @@
 BASE_NAME            = PciIo_PciIoBbTest
 FILE_GUID            = CE59517D-988F-4d45-A78E-177B09C743CE
 COMPONENT_TYPE       = BS_DRIVER
-#BUILD_TYPE           = CUSTOM_MAKEFILE
+MODULE_TYPE          = UEFI_DRIVER
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
 
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf
index 7024fec0..a3203b5f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.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
@@ -28,6 +29,7 @@
 BASE_NAME            = PciRootBridgeIo_PciRootBridgeIoBbTest
 FILE_GUID            = FDD56A08-E483-49c5-8173-49D92748E77C
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 27/30] EFI/Protocol: Fix inf file for LoadedImage protocol test.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (24 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 26/30] EFI/Protocol: Fix inf files for Pci protocol related dependency data Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 28/30] EFI/Protocol: Fix inf file for PxeBase dependency data Supreeth Venkatesh
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../BlackBoxTest/LoadedImageBBTest.inf        | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
index 66704ef6..a97acfe2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.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,29 +26,29 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = LoadedImageBBTest
 FILE_GUID            = 23714078-BF1D-404e-A965-DED3D4952FE4
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = InitializeBBTestLoadedImageProtocol
 
 [sources.common]
   Guid.c
   LoadedImageBBTestMain.c
   LoadedImageBBTestProtocolDefinition.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=InitializeBBTestLoadedImageProtocol
+[Protocols]
+  gEfiTestProfileLibraryGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 28/30] EFI/Protocol: Fix inf file for PxeBase dependency data.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (25 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 27/30] EFI/Protocol: Fix inf file for LoadedImage protocol test Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 29/30] EFI/Protocol: Fix inf file for SimpleFileSystem protocol test Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file Supreeth Venkatesh
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf
index e53151df..6cda9e62 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.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
@@ -28,6 +29,7 @@
 BASE_NAME            = PxeBaseCode_PxeBaseCodeBbTest
 FILE_GUID            = C0A87EC1-FEFD-41d0-8A52-5F3B74B60FAF
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
 #BUILD_TYPE           = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE      = MSFT| makefile
 CUSTOM_MAKEFILE      = GCC | GNUmakefile
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 29/30] EFI/Protocol: Fix inf file for SimpleFileSystem protocol test.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (26 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 28/30] EFI/Protocol: Fix inf file for PxeBase dependency data Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-28 23:12 ` [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file Supreeth Venkatesh
  28 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 .../BlackBoxTest/SimpleFileSystemBBTest.inf   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf
index 608634e8..0f536e8c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.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
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = SimpleFileSystemBBTest
 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
@@ -42,19 +47,19 @@ 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]
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.
  2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
                   ` (27 preceding siblings ...)
  2019-03-28 23:12 ` [edk2-test][PATCH v1 29/30] EFI/Protocol: Fix inf file for SimpleFileSystem protocol test Supreeth Venkatesh
@ 2019-03-28 23:12 ` Supreeth Venkatesh
  2019-03-29  9:03   ` Jin, Eric
  28 siblings, 1 reply; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-28 23:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: Supreeth Venkatesh, eric.jin

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.venkatesh@arm.com>
---
 uefi-sct/SctPkg/UEFI/UEFI.dec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-sct/SctPkg/UEFI/UEFI.dec
index 8495a4e1..bdf3323f 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI.dec
+++ b/uefi-sct/SctPkg/UEFI/UEFI.dec
@@ -1,7 +1,7 @@
 ## @file
 #
 #  Copyright 2004 - 2017 Unified EFI, Inc.<BR>
-#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2014 - 2019, ARM Limited. All rights reserved.
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
 #
@@ -119,14 +119,22 @@
   gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
   gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46, {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
   gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
+  gBlackBoxEfiHIIDatabaseProtocolGuid = { 0xef9fc172, 0xa1b2, 0x4693, { 0xb3, 0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42 }}
+  gBlackBoxEfiHIIPackageListProtocolGuid = { 0x6a1ee763, 0xd47a, 0x43b4, { 0xaa, 0xbe, 0xef, 0x1d, 0xe2, 0xab, 0x56, 0xfc }}
+  gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
+  gBlackBoxEfiHIIConfigAccessProtocolGuid = { 0x330d4706, 0xf2a0, 0x4e4f, { 0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85 }}
+  gBlackBoxEfiHIIConfigRoutingProtocolGuid = { 0x587e72d7, 0xcc50, 0x4f79, { 0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f }}
   gBlackBoxEfiHIIFontProtocolGuid = { 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 }}
   gBlackBoxEfiHIIFontExProtocolGuid = { 0x849e6875, 0xdb35, 0x4df8, { 0xb4, 0x1e, 0xc8, 0xf3, 0x37, 0x18, 0x7, 0x3f }}
   gBlackBoxEfiHttpProtocolGuid = { 0x7A59B29B, 0x910B, 0x4171, { 0x82, 0x42, 0xA8, 0x5A, 0x0D, 0xF2, 0x5B, 0x5B }}
   gBlackBoxEfiHttpServiceBindingProtocolGuid = { 0xbdc8e6af, 0xd9bc, 0x4379, { 0xa7, 0x2a, 0xe0, 0xc4, 0xe7, 0x5d, 0xae, 0x1c }}
   gBlackBoxEfiIp4ServiceBindingProtocolGuid = { 0xc51711e7, 0xb4bf, 0x404a, {0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4 } }
   gBlackBoxEfiIp4ProtocolGuid = { 0x41d94cd2, 0x35b6, 0x455a, {0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd } }
+  gBlackBoxEfiIp4ConfigProtocolGuid = { 0x3B95AA31, 0x3793, 0x434B, {0x86, 0x67, 0xC8, 0x07, 0x08, 0x92, 0xE0, 0x5E } }
+  gBlackBoxEfiIp4Config2ProtocolGuid = { 0x5b446ed1, 0xe30b, 0x4faa, {0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } }
   gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
   gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
+  gBlackBoxEfiIp6ConfigProtocolGuid = { 0x937fe521, 0x95ae, 0x4d1a, {0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } }
   gBlackBoxEfiIPsec2ProtocolGuid = {0xa3979e64, 0xace8, 0x4ddc, { 0xbc, 0x7, 0x4d, 0x66, 0xb8, 0xfd, 0x9, 0x77 }}
   gBlackBoxEfiIPsecConfigProtocolGuid = { 0xce5e5929, 0xc7a3, 0x4602, { 0xad, 0x9e, 0xc9, 0xda, 0xf9, 0x4e, 0xbf, 0xcf }}
   gBlackBoxEfiIScsiInitiatorNameProtocolGuid = { 0x59324945, 0xec44, 0x4c0d, {0xb1, 0xcd, 0x9d, 0xb1, 0x39, 0xdf, 0x7, 0xc }}
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 32+ messages in thread

* Re: [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.
  2019-03-28 23:12 ` [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file Supreeth Venkatesh
@ 2019-03-29  9:03   ` Jin, Eric
  2019-03-29 14:12     ` Supreeth Venkatesh
  0 siblings, 1 reply; 32+ messages in thread
From: Jin, Eric @ 2019-03-29  9:03 UTC (permalink / raw)
  To: Supreeth Venkatesh, edk2-devel@lists.01.org; +Cc: Jin, Eric

Hi Supreeth,

Thanks a lot to fix this build issue at first.
Comments for this series of patches are replied below.

Patch 1/2 : 
1. Could the two patches can be re-organized? For example, merge the change of *.dsc in patch 2 to patch 1 to make it clear.
2. The change of CommonGenFramework.sh in patch 2 will remove the ebc from binary package. 
 
Patch 24 : 
1. Please don't forget change the copyright part
2. Do you meet the similar issue that "UEFI_CONFIG_LANG" : macro redefinition while build?

Other Patches :
1. Please remove "COMPONENT_TYPE       = BS_DRIVER"

With that
Reviewed-by: Eric Jin <eric.jin@intel.com>

Best Regards
Eric

-----Original Message-----
From: Supreeth Venkatesh <supreeth.venkatesh@arm.com> 
Sent: Friday, March 29, 2019 7:12 AM
To: edk2-devel@lists.01.org
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Jin, Eric <eric.jin@intel.com>
Subject: [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.

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.venkatesh@arm.com>
---
 uefi-sct/SctPkg/UEFI/UEFI.dec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-sct/SctPkg/UEFI/UEFI.dec index 8495a4e1..bdf3323f 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI.dec
+++ b/uefi-sct/SctPkg/UEFI/UEFI.dec
@@ -1,7 +1,7 @@
 ## @file
 #
 #  Copyright 2004 - 2017 Unified EFI, Inc.<BR> -#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2014 - 2019, ARM Limited. All rights reserved.
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>  #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>  # @@ -119,14 +119,22 @@
   gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
   gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46, {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
   gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
+  gBlackBoxEfiHIIDatabaseProtocolGuid = { 0xef9fc172, 0xa1b2, 0x4693, { 
+ 0xb3, 0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42 }}  
+ gBlackBoxEfiHIIPackageListProtocolGuid = { 0x6a1ee763, 0xd47a, 0x43b4, 
+ { 0xaa, 0xbe, 0xef, 0x1d, 0xe2, 0xab, 0x56, 0xfc }}  
+ gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 
+ 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}  
+ gBlackBoxEfiHIIConfigAccessProtocolGuid = { 0x330d4706, 0xf2a0, 
+ 0x4e4f, { 0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85 }}  
+ gBlackBoxEfiHIIConfigRoutingProtocolGuid = { 0x587e72d7, 0xcc50, 
+ 0x4f79, { 0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f }}
   gBlackBoxEfiHIIFontProtocolGuid = { 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 }}
   gBlackBoxEfiHIIFontExProtocolGuid = { 0x849e6875, 0xdb35, 0x4df8, { 0xb4, 0x1e, 0xc8, 0xf3, 0x37, 0x18, 0x7, 0x3f }}
   gBlackBoxEfiHttpProtocolGuid = { 0x7A59B29B, 0x910B, 0x4171, { 0x82, 0x42, 0xA8, 0x5A, 0x0D, 0xF2, 0x5B, 0x5B }}
   gBlackBoxEfiHttpServiceBindingProtocolGuid = { 0xbdc8e6af, 0xd9bc, 0x4379, { 0xa7, 0x2a, 0xe0, 0xc4, 0xe7, 0x5d, 0xae, 0x1c }}
   gBlackBoxEfiIp4ServiceBindingProtocolGuid = { 0xc51711e7, 0xb4bf, 0x404a, {0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4 } }
   gBlackBoxEfiIp4ProtocolGuid = { 0x41d94cd2, 0x35b6, 0x455a, {0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd } }
+  gBlackBoxEfiIp4ConfigProtocolGuid = { 0x3B95AA31, 0x3793, 0x434B, 
+ {0x86, 0x67, 0xC8, 0x07, 0x08, 0x92, 0xE0, 0x5E } }  
+ gBlackBoxEfiIp4Config2ProtocolGuid = { 0x5b446ed1, 0xe30b, 0x4faa, 
+ {0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } }
   gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
   gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
+  gBlackBoxEfiIp6ConfigProtocolGuid = { 0x937fe521, 0x95ae, 0x4d1a, 
+ {0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } }
   gBlackBoxEfiIPsec2ProtocolGuid = {0xa3979e64, 0xace8, 0x4ddc, { 0xbc, 0x7, 0x4d, 0x66, 0xb8, 0xfd, 0x9, 0x77 }}
   gBlackBoxEfiIPsecConfigProtocolGuid = { 0xce5e5929, 0xc7a3, 0x4602, { 0xad, 0x9e, 0xc9, 0xda, 0xf9, 0x4e, 0xbf, 0xcf }}
   gBlackBoxEfiIScsiInitiatorNameProtocolGuid = { 0x59324945, 0xec44, 0x4c0d, {0xb1, 0xcd, 0x9d, 0xb1, 0x39, 0xdf, 0x7, 0xc }}
--
2.17.1



^ permalink raw reply	[flat|nested] 32+ messages in thread

* Re: [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.
  2019-03-29  9:03   ` Jin, Eric
@ 2019-03-29 14:12     ` Supreeth Venkatesh
  0 siblings, 0 replies; 32+ messages in thread
From: Supreeth Venkatesh @ 2019-03-29 14:12 UTC (permalink / raw)
  To: Jin, Eric, edk2-devel@lists.01.org

Thank you very much for the comments/feedback.
I will check this in after taking care of your feedback.

Supreeth

-----Original Message-----
From: Jin, Eric <eric.jin@intel.com>
Sent: Friday, March 29, 2019 4:04 AM
To: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; edk2-devel@lists.01.org
Cc: Jin, Eric <eric.jin@intel.com>
Subject: RE: [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.

Hi Supreeth,

Thanks a lot to fix this build issue at first.
Comments for this series of patches are replied below.

Patch 1/2 :
1. Could the two patches can be re-organized? For example, merge the change of *.dsc in patch 2 to patch 1 to make it clear.
2. The change of CommonGenFramework.sh in patch 2 will remove the ebc from binary package.

Patch 24 :
1. Please don't forget change the copyright part 2. Do you meet the similar issue that "UEFI_CONFIG_LANG" : macro redefinition while build?

Other Patches :
1. Please remove "COMPONENT_TYPE       = BS_DRIVER"

With that
Reviewed-by: Eric Jin <eric.jin@intel.com>

Best Regards
Eric

-----Original Message-----
From: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Sent: Friday, March 29, 2019 7:12 AM
To: edk2-devel@lists.01.org
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Jin, Eric <eric.jin@intel.com>
Subject: [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.

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.venkatesh@arm.com>
---
 uefi-sct/SctPkg/UEFI/UEFI.dec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-sct/SctPkg/UEFI/UEFI.dec index 8495a4e1..bdf3323f 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI.dec
+++ b/uefi-sct/SctPkg/UEFI/UEFI.dec
@@ -1,7 +1,7 @@
 ## @file
 #
 #  Copyright 2004 - 2017 Unified EFI, Inc.<BR> -#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2014 - 2019, ARM Limited. All rights reserved.
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>  #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>  # @@ -119,14 +119,22 @@
   gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
   gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46, {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
   gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
+  gBlackBoxEfiHIIDatabaseProtocolGuid = { 0xef9fc172, 0xa1b2, 0x4693, {
+ 0xb3, 0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42 }}
+ gBlackBoxEfiHIIPackageListProtocolGuid = { 0x6a1ee763, 0xd47a, 0x43b4,
+ { 0xaa, 0xbe, 0xef, 0x1d, 0xe2, 0xab, 0x56, 0xfc }}
+ gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, {
+ 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
+ gBlackBoxEfiHIIConfigAccessProtocolGuid = { 0x330d4706, 0xf2a0,
+ 0x4e4f, { 0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85 }}
+ gBlackBoxEfiHIIConfigRoutingProtocolGuid = { 0x587e72d7, 0xcc50,
+ 0x4f79, { 0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f }}
   gBlackBoxEfiHIIFontProtocolGuid = { 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 }}
   gBlackBoxEfiHIIFontExProtocolGuid = { 0x849e6875, 0xdb35, 0x4df8, { 0xb4, 0x1e, 0xc8, 0xf3, 0x37, 0x18, 0x7, 0x3f }}
   gBlackBoxEfiHttpProtocolGuid = { 0x7A59B29B, 0x910B, 0x4171, { 0x82, 0x42, 0xA8, 0x5A, 0x0D, 0xF2, 0x5B, 0x5B }}
   gBlackBoxEfiHttpServiceBindingProtocolGuid = { 0xbdc8e6af, 0xd9bc, 0x4379, { 0xa7, 0x2a, 0xe0, 0xc4, 0xe7, 0x5d, 0xae, 0x1c }}
   gBlackBoxEfiIp4ServiceBindingProtocolGuid = { 0xc51711e7, 0xb4bf, 0x404a, {0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4 } }
   gBlackBoxEfiIp4ProtocolGuid = { 0x41d94cd2, 0x35b6, 0x455a, {0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd } }
+  gBlackBoxEfiIp4ConfigProtocolGuid = { 0x3B95AA31, 0x3793, 0x434B,
+ {0x86, 0x67, 0xC8, 0x07, 0x08, 0x92, 0xE0, 0x5E } }
+ gBlackBoxEfiIp4Config2ProtocolGuid = { 0x5b446ed1, 0xe30b, 0x4faa,
+ {0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } }
   gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
   gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
+  gBlackBoxEfiIp6ConfigProtocolGuid = { 0x937fe521, 0x95ae, 0x4d1a,
+ {0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } }
   gBlackBoxEfiIPsec2ProtocolGuid = {0xa3979e64, 0xace8, 0x4ddc, { 0xbc, 0x7, 0x4d, 0x66, 0xb8, 0xfd, 0x9, 0x77 }}
   gBlackBoxEfiIPsecConfigProtocolGuid = { 0xce5e5929, 0xc7a3, 0x4602, { 0xad, 0x9e, 0xc9, 0xda, 0xf9, 0x4e, 0xbf, 0xcf }}
   gBlackBoxEfiIScsiInitiatorNameProtocolGuid = { 0x59324945, 0xec44, 0x4c0d, {0xb1, 0xcd, 0x9d, 0xb1, 0x39, 0xdf, 0x7, 0xc }}
--
2.17.1

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.


^ permalink raw reply	[flat|nested] 32+ messages in thread

end of thread, other threads:[~2019-03-29 14:12 UTC | newest]

Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-28 23:11 [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64 Supreeth Venkatesh
2019-03-28 23:11 ` [edk2-test][PATCH v1 02/30] SctPkg: Ignore Ebc protocol test " Supreeth Venkatesh
2019-03-28 23:11 ` [edk2-test][PATCH v1 03/30] IHV/Protocol: Fix inf files for IHV protocol tests Supreeth Venkatesh
2019-03-28 23:11 ` [edk2-test][PATCH v1 04/30] RIVL/Protocol: Fix inf files for RIVL Arp " Supreeth Venkatesh
2019-03-28 23:11 ` [edk2-test][PATCH v1 05/30] RIVL/Protocol: Fix inf files for Dhcp4 " Supreeth Venkatesh
2019-03-28 23:11 ` [edk2-test][PATCH v1 06/30] RIVL/Protocol: Fix inf files for Dhcp6 " Supreeth Venkatesh
2019-03-28 23:11 ` [edk2-test][PATCH v1 07/30] RIVL/Protocol: Fix inf files for Http " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 08/30] RIVL/Protocol: Fix inf files for InternetProtocol4 tests Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 09/30] RIVL/Protocol: Fix inf files for Ip6 tests Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 10/30] RIVL/Protocol: Fix inf files for Managed network protocol tests Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 11/30] RIVL/Protocol: Fix inf files for Mtftp4 " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 12/30] RIVL/Protocol: Fix inf files for Mtftp6 " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 13/30] RIVL/Protocol: fix inf file for PXE protocol test Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 14/30] RIVL/Protocol: Fix inf files for Simple Network " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 15/30] RIVL/Protocol: Fix inf files for Tcp4 protocol tests Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 16/30] RIVL/Protocol: Fix inf file for Tcp6 " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 17/30] RIVL/Protocol: Fix inf files for Udp4 " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 18/30] RIVL/Protocol: Fix inf files for Udp6 " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 19/30] BootServices: Fix inf files for ImageServices dependency data files Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 20/30] EFI/Protocol: Fix inf file for DebugSupport protocol test Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 21/30] EFI/Protocol: Fix inf files for Decompress protocol dependency data Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 22/30] EFI/Protocol: Fix inf files for DevicePath related protocol tests Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 23/30] EFI/Protocol: Fix inf files for HII " Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 24/30] UEFI/Protocol: Remove struct and enum in Hii defines file Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 25/30] EFI/Protocol: Fix inf files for SimpleText protocol tests Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 26/30] EFI/Protocol: Fix inf files for Pci protocol related dependency data Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 27/30] EFI/Protocol: Fix inf file for LoadedImage protocol test Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 28/30] EFI/Protocol: Fix inf file for PxeBase dependency data Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 29/30] EFI/Protocol: Fix inf file for SimpleFileSystem protocol test Supreeth Venkatesh
2019-03-28 23:12 ` [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file Supreeth Venkatesh
2019-03-29  9:03   ` Jin, Eric
2019-03-29 14:12     ` Supreeth Venkatesh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox