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.venkat...@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
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
