[edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7

[edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7

[Lokesh B V]

EDK2 supports EFI version 2.7 and so allow UEFI-SCT to be
usable with this version of EFI.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
 uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h
index d24c201..8fda374 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h
@@ -2,6 +2,7 @@
 
   Copyright 2006 - 2017 Unified EFI, Inc.<BR>
   Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2018 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
@@ -46,6 +47,8 @@ Abstract:
 #define EFI_SCT_NAME                        L"UEFI2.5 Self Certification Test(SCT2)"
 #elif (EFI_SPECIFICATION_VERSION == EFI_2_60_SYSTEM_TABLE_REVISION)
 #define EFI_SCT_NAME                        L"UEFI2.6 Self Certification Test(SCT2)"
+#elif (EFI_SPECIFICATION_VERSION == EFI_2_70_SYSTEM_TABLE_REVISION)
+#define EFI_SCT_NAME                        L"UEFI2.7 Self Certification Test(SCT2)"
 #else
 #error Unknown EFI_SPECIFICATION_VERSION
 #endif
-- 
2.7.4

[edk2-test][PATCH] SctPkg/UEFI: Fix invalid GUID value format error

[Lokesh B V]

Fix all GUID values that are defined with a invalid GUID
value format.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
 uefi-sct/SctPkg/UEFI/UEFI.dec | 204 +++++++++++++++++++++---------------------
 1 file changed, 102 insertions(+), 102 deletions(-)

diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-sct/SctPkg/UEFI/UEFI.dec
index 14cc5b0..e3a6148 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, ARM Limited. All rights reserved. 
+#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
 #
@@ -44,25 +44,25 @@
   
 
 [Guids.common]
-  gBlackBoxEfiFileInfoGuid = { 0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
-  gBlackBoxEfiFileInfoIdGuid = { 0x9576e93, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
+  gBlackBoxEfiFileInfoGuid = { 0x9576e92, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gBlackBoxEfiFileInfoIdGuid = { 0x9576e93, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
   gBlackBoxEfiFileSystemInfoGuid = { 0x09576E93, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
-  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid = { 0xDB47D7D3,0xFE81, 0x11d3, 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
-  gBlackBoxEfiTcp4RegistryDataGuid = { 0x755B4303, 0xCAA5, 0x4481, 0xB1, 0x3D, 0x07, 0xBE, 0x14, 0xD5, 0x4D, 0x3F}
-  gBlackBoxEfiTcp6RegistryDataGuid = { 0x80623540, 0x7B41, 0x4306, 0x99, 0x87, 0x1B, 0xF6, 0xE5, 0xAD, 0x15, 0x3E }
+  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid = { 0xDB47D7D3, 0xFE81, 0x11d3, { 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
+  gBlackBoxEfiTcp4RegistryDataGuid = { 0x755B4303, 0xCAA5, 0x4481, { 0xB1, 0x3D, 0x07, 0xBE, 0x14, 0xD5, 0x4D, 0x3F }}
+  gBlackBoxEfiTcp6RegistryDataGuid = { 0x80623540, 0x7B41, 0x4306, { 0x99, 0x87, 0x1B, 0xF6, 0xE5, 0xAD, 0x15, 0x3E }}
   gBlackBoxEfiPcAnsiGuid = { 0xE0C14753, 0xF9BE, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
   gBlackBoxEfiVT100Guid = { 0xDFA66065, 0xB419, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
   gBlackBoxEfiVT100PlusGuid = { 0x7BAEC70B, 0x57E0, 0x4C76, { 0x8E, 0x87, 0x2F, 0x9E, 0x28, 0x08, 0x83, 0x43 }}
   gBlackBoxEfiVTUTF8Guid = { 0xAD15A0D6, 0x8BEC, 0x4ACF, { 0xA0, 0x73, 0xD0, 0x1D, 0xE7, 0x7E, 0x2D, 0x88 }}
 
-  gBlackBoxEfiHash2AlgorithmSha1Guid = { 0x2ae9d80f, 0x3fb2, 0x4095, 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6 } 
-  gBlackBoxEfiHash2AlgorithmSha224Guid = { 0x8df01a06, 0x9bd5, 0x4bf7, 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b }
-  gBlackBoxEfiHash2AlgorithmSha256Guid = { 0x51aa59de, 0xfdf2, 0x4ea3, 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 }
-  gBlackBoxEfiHash2AlgorithmSha384Guid = { 0xefa96432, 0xde33, 0x4dd2, 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a }
-  gBlackBoxEfiHash2AlgorithmSha512Guid = { 0xcaa4381e, 0x750c, 0x4770, 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 }
-  gBlackBoxEfiHash2AlgorithmMD5Guid = { 0xaf7c79c, 0x65b5, 0x4319, 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 }
-  gBlackBoxEfiHash2AlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2, 0x40ca, 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }
-  gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7, 0x4814, 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }
+  gBlackBoxEfiHash2AlgorithmSha1Guid = { 0x2ae9d80f, 0x3fb2, 0x4095, { 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6 }}
+  gBlackBoxEfiHash2AlgorithmSha224Guid = { 0x8df01a06, 0x9bd5, 0x4bf7, { 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b }}
+  gBlackBoxEfiHash2AlgorithmSha256Guid = { 0x51aa59de, 0xfdf2, 0x4ea3, { 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 }}
+  gBlackBoxEfiHash2AlgorithmSha384Guid = { 0xefa96432, 0xde33, 0x4dd2, { 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a }}
+  gBlackBoxEfiHash2AlgorithmSha512Guid = { 0xcaa4381e, 0x750c, 0x4770, { 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 }}
+  gBlackBoxEfiHash2AlgorithmMD5Guid = { 0xaf7c79c, 0x65b5, 0x4319, { 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 }}
+  gBlackBoxEfiHash2AlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2, 0x40ca, { 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }}
+  gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7, 0x4814, { 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }}
 
   
   gBlackBoxEfiCertSha256Guid             = { 0xc1c41626, 0x504c, 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }} 
@@ -79,109 +79,109 @@
   gBlackBoxEfiPersistentVirtualCdGuid = { 0x08018188, 0x42CD, 0xBB48, {0x10, 0x0F, 0x53, 0x87, 0xD5, 0x3D, 0xED, 0x3D }}
 
 [Protocols.common]
-  gBlackBoxEfiAbsolutePointerProtocolGuid = { 0x8D59D32B, 0xC655, 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 } }
-  gBlackBoxEfiAcpiTableProtocolGuid = { 0xffe06bdd, 0x6107, 0x46a6, 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }
-  gBlackBoxEfiArpProtocolGuid = { 0xf4b427bb, 0xba21, 0x4f16, 0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }
-  gBlackBoxEfiArpServiceBindingProtocolGuid = { 0xf44c00ee, 0x1f2c, 0x4a00, 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3 }
-  gBlackBoxEfiAtaPassThruProtocolGuid = { 0x1d3de7f0, 0x807, 0x424f, {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f } }
-  gBlackBoxEfiAuthenticationProtocolGuid = {0x7671d9d0, 0x52db, 0x4173, 0xaa,0x69,0x23,0x27,0xf2,0x1f,0x0b,0xc7}
-  gBlackBoxEfiBisProtocolGuid = { 0x0b64aab0, 0x5429, 0x11d4, 0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf }
+  gBlackBoxEfiAbsolutePointerProtocolGuid = { 0x8D59D32B, 0xC655, 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 }}
+  gBlackBoxEfiAcpiTableProtocolGuid = { 0xffe06bdd, 0x6107, 0x46a6, { 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }}
+  gBlackBoxEfiArpProtocolGuid = { 0xf4b427bb, 0xba21, 0x4f16, { 0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }}
+  gBlackBoxEfiArpServiceBindingProtocolGuid = { 0xf44c00ee, 0x1f2c, 0x4a00, { 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3 }}
+  gBlackBoxEfiAtaPassThruProtocolGuid = { 0x1d3de7f0, 0x807, 0x424f, {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f }}
+  gBlackBoxEfiAuthenticationProtocolGuid = {0x7671d9d0, 0x52db, 0x4173, { 0xaa,0x69,0x23,0x27,0xf2,0x1f,0x0b,0xc7 }}
+  gBlackBoxEfiBisProtocolGuid = { 0x0b64aab0, 0x5429, 0x11d4, { 0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf }}
   gBlackBoxEfiBlockIoProtocolGuid = { 0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
-  gBlackBoxEfiBlockIo2ProtocolGuid = { 0xa77b2472, 0xe282, 0x4e9f, 0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }
-  gBlackBoxEfiBusSpecificDriverOverrideProtocolGuid = { 0x3bc1b285, 0x8a15, 0x4a82, 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 }
-  gBlackBoxEfiComponentNameProtocolGuid = { 0x107a772c, 0xd5e1, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
-  gBlackBoxEfiComponentName2ProtocolGuid = { 0x6a7a5cff, 0xe8d9, 0x4f70, 0xba, 0xda, 0x75, 0xab, 0x30,0x25, 0xce, 0x14 }
-  gBlackBoxEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC, 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }
-  gBlackBoxEfiDebugSupportProtocolGuid = { 0x2755590C, 0x6F3C, 0x42FA, 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }
-  gBlackBoxEfiDecompressProtocolGuid = { 0xd8117cfe, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
-  gBlackBoxEfiDeviceIoProtocolGuid = { 0xaf6ac311, 0x84c3, 0x11d2, 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
-  gBlackBoxEfiDevicePathProtocolGuid = { 0x9576e91, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
-  gBlackBoxEfiDevicePathFromTextProtocolGuid = { 0x5c99a21, 0xc70f, 0x4ad2, 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e }
-  gBlackBoxEfiDevicePathToTextProtocolGuid = { 0x8b843e20, 0x8132, 0x4852, 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c }
-  gBlackBoxEfiDevicePathUtilitiesProtocolGuid = { 0x379be4e, 0xd706, 0x437d, 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4 }
-  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid = {0x9d9a39d8, 0xbd42, 0x4a73, 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80}
-  gBlackBoxEfiDhcp4ProtocolGuid             = { 0x8a219718, 0x4ef5, 0x4761,  0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56}
-  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid = {0x9fb9a8a1, 0x2f4a, 0x43a6, 0x88, 0x9c, 0xd0, 0xf7, 0xb6, 0xc4, 0x7a, 0xd5}
-  gBlackBoxEfiDhcp6ProtocolGuid             = {0x87c8bad7, 0x595, 0x4053, 0x82, 0x97, 0xde, 0xde, 0x39, 0x5f, 0x5d, 0x5b}
-  gBlackBoxEfiDiskIoProtocolGuid = { 0xce345171, 0xba0b, 0x11d2,  0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
+  gBlackBoxEfiBlockIo2ProtocolGuid = { 0xa77b2472, 0xe282, 0x4e9f, { 0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }}
+  gBlackBoxEfiBusSpecificDriverOverrideProtocolGuid = { 0x3bc1b285, 0x8a15, 0x4a82, { 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 }}
+  gBlackBoxEfiComponentNameProtocolGuid = { 0x107a772c, 0xd5e1, 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiComponentName2ProtocolGuid = { 0x6a7a5cff, 0xe8d9, 0x4f70, { 0xba, 0xda, 0x75, 0xab, 0x30,0x25, 0xce, 0x14 }}
+  gBlackBoxEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC, { 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }}
+  gBlackBoxEfiDebugSupportProtocolGuid = { 0x2755590C, 0x6F3C, 0x42FA, { 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }}
+  gBlackBoxEfiDecompressProtocolGuid = { 0xd8117cfe, 0x94a6, 0x11d4, { 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiDeviceIoProtocolGuid = { 0xaf6ac311, 0x84c3, 0x11d2, { 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gBlackBoxEfiDevicePathProtocolGuid = { 0x9576e91, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gBlackBoxEfiDevicePathFromTextProtocolGuid = { 0x5c99a21, 0xc70f, 0x4ad2, { 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e }}
+  gBlackBoxEfiDevicePathToTextProtocolGuid = { 0x8b843e20, 0x8132, 0x4852, { 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c }}
+  gBlackBoxEfiDevicePathUtilitiesProtocolGuid = { 0x379be4e, 0xd706, 0x437d, { 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4 }}
+  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid = {0x9d9a39d8, 0xbd42, 0x4a73, { 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80 }}
+  gBlackBoxEfiDhcp4ProtocolGuid             = { 0x8a219718, 0x4ef5, 0x4761,  { 0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56 }}
+  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid = { 0x9fb9a8a1, 0x2f4a, 0x43a6, { 0x88, 0x9c, 0xd0, 0xf7, 0xb6, 0xc4, 0x7a, 0xd5 }}
+  gBlackBoxEfiDhcp6ProtocolGuid             = { 0x87c8bad7, 0x595, 0x4053, { 0x82, 0x97, 0xde, 0xde, 0x39, 0x5f, 0x5d, 0x5b }}
+  gBlackBoxEfiDiskIoProtocolGuid = { 0xce345171, 0xba0b, 0x11d2, { 0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
   gBlackBoxEfiDiskIo2ProtocolGuid = { 0x151c8eae, 0x7f2c, 0x472c, { 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 }}
-  gBlackBoxEfiDriverConfigurationProtocolGuid = { 0x107a772b, 0xd5e1, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
-  gBlackBoxEfiDriverDiagnosticsProtocolGuid = { 0x0784924f, 0xe296, 0x11d4, 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
-  gBlackBoxEfiDriverDiagnostics2ProtocolGuid = { 0x4d330321, 0x025f, 0x4aac, 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 }
-  gBlackBoxEfiDriverSupportedEfiVersionProtocolGuid = { 0x5c198761, 0x16a8, 0x4e69, 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d }
-  gBlackBoxEfiEbcProtocolGuid = {0x13AC6DD1, 0x73D0, 0x11D4, 0xB0, 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7}
-  gBlackBoxEfiEbcDriverProtocolGuid = { 0xf01547c5, 0x6f06, 0x4c6d, 0xb6, 0x10, 0x88, 0x91, 0xe7, 0x74, 0x36, 0x45 }
-  gBlackBoxEfiExtScsiPassThruProtocolGuid = { 0x143b7632, 0xb81b, 0x4cb7, {0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe }  }
-  gBlackBoxEfiFirmwareManagementProtocolGuid = { 0x86c77a67, 0xb97, 0x4633, 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 }
-  gBlackBoxEfiGraphicsOutputProtocolGuid = {0x9042a9de, 0x23dc, 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a}
-  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}
-  gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46, 0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }
-  gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 } }
-  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 }
+  gBlackBoxEfiDriverConfigurationProtocolGuid = { 0x107a772b, 0xd5e1, 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiDriverDiagnosticsProtocolGuid = { 0x0784924f, 0xe296, 0x11d4, { 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiDriverDiagnostics2ProtocolGuid = { 0x4d330321, 0x025f, 0x4aac, { 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 }}
+  gBlackBoxEfiDriverSupportedEfiVersionProtocolGuid = { 0x5c198761, 0x16a8, 0x4e69, { 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d }}
+  gBlackBoxEfiEbcProtocolGuid = {0x13AC6DD1, 0x73D0, 0x11D4, { 0xB0, 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7 }}
+  gBlackBoxEfiEbcDriverProtocolGuid = { 0xf01547c5, 0x6f06, 0x4c6d, { 0xb6, 0x10, 0x88, 0x91, 0xe7, 0x74, 0x36, 0x45 }}
+  gBlackBoxEfiExtScsiPassThruProtocolGuid = { 0x143b7632, 0xb81b, 0x4cb7, { 0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe }}
+  gBlackBoxEfiFirmwareManagementProtocolGuid = { 0x86c77a67, 0xb97, 0x4633, { 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 }}
+  gBlackBoxEfiGraphicsOutputProtocolGuid = {0x9042a9de, 0x23dc, 0x4a38, { 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a }}
+  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 }}
+  gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46, {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
+  gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
+  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 } }
   gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
   gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
-  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 } }
+  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 }}
   gBlackBoxEfiLoadedImageProtocolGuid = { 0x5B1B31A1, 0x9562, 0x11D2, { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
   gBlackBoxEfiLoadedImageDevicePathProtocolGuid = {0xbc62157e, 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf }}
-  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid = { 0xf36ff770, 0xa7e1, 0x42cf, 0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71,0xf4, 0x4c }
-  gBlackBoxEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5, 0x4326, 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }
-  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid = { 0x2FE800BE, 0x8F01, 0x4aa6, 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }
-  gBlackBoxEfiMtftp4ProtocolGuid = { 0x78247c57, 0x63db, 0x4708, 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }
-  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid = { 0xd9760ff3, 0x3cca, 0x4267, 0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 }
-  gBlackBoxEfiMtftp6ProtocolGuid = { 0xbf0a78ba, 0xec29, 0x49cf, 0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 }
-  gBlackBoxEfiNetInterfaceConfigProtocolGuid = { 0xdc5800a1, 0xba61, 0x470b, 0xb4, 0x0e, 0x6e, 0x24, 0x34, 0xd6, 0x71, 0x2b }
-  gBlackBoxEfiPciIoProtocolGuid = { 0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a }
-  gBlackBoxEfiPciRootBridgeIoProtocolGuid = { 0x2f707ebb, 0x4a1a, 0x11d4, 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
-  gBlackBoxEfiPlatformDriverOverrideProtocolGuid = { 0x6b30c738, 0xa391, 0x11d4, 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d}
-  gBlackBoxEfiPlatformToDriverConfigurationProtocolGuid = { 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2, 0x3c, 0x4b} }
-  gBlackBoxEfiPlatformToDriverConfigurationClpGuid = { 0x345ecc0e, 0x0cb6, 0x4b75, 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33, 0x3e }
-  gBlackBoxEfiPxeBaseCodeProtocolGuid = { 0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }
-  gBlackBoxEfiPxeBaseCodeCallbackProtocolGuid = { 0x245dca21, 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
-  gBlackBoxEfiTapeIoProtocolGuid = {0X1E93E633, 0XD65A, 0X459E, 0XAB,0X84,0X93,0XD9,0XEC,0X26,0X6D,0X18}
-  gBlackBoxEfiTcp4ServiceBindingProtocolGuid = { 0x00720665, 0x67EB, 0x4a99, 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9}
-  gBlackBoxEfiTcp4ProtocolGuid = { 0x65530BC7, 0xA359, 0x410f, 0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62}
-  gBlackBoxEfiTcp6ServiceBindingProtocolGuid = { 0xec20eb79, 0x6c1a, 0x4664, 0x9a, 0x0d, 0xd2, 0xe4, 0xcc, 0x16, 0xd6, 0x64 }
-  gBlackBoxEfiTcp6ProtocolGuid = { 0x46e44855, 0xbd60, 0x4ab7, 0xab, 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 }
-  gBlackBoxEfiScsiIoProtocolGuid = { 0x932f47E6, 0x2362, 0x4002, 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85 }
-  gBlackBoxEfiScsiPassThruProtocolGuid = { 0xa59e8fcf, 0xbda0, 0x43bb, 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 }
-  gBlackBoxEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2, 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }
-  gBlackBoxEfiSimpleFileSystemProtocolGuid = { 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
-  gBlackBoxEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25, 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
-  gBlackBoxEfiSimplePointerProtocolGuid = { 0xA19832B9, 0xAC25, 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
-  gBlackBoxEfiSimpleTextInProtocolGuid = { 0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} }
-  gBlackBoxEfiSimpleTextInputExProtocolGuid = {0xdd9e7534, 0x7762, 0x4698, 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa}
+  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid = { 0xf36ff770, 0xa7e1, 0x42cf, {0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71,0xf4, 0x4c }}
+  gBlackBoxEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5, 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }}
+  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid = { 0x2FE800BE, 0x8F01, 0x4aa6, { 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }}
+  gBlackBoxEfiMtftp4ProtocolGuid = { 0x78247c57, 0x63db, 0x4708, { 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }}
+  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid = { 0xd9760ff3, 0x3cca, 0x4267, { 0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 }}
+  gBlackBoxEfiMtftp6ProtocolGuid = { 0xbf0a78ba, 0xec29, 0x49cf, { 0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 }}
+  gBlackBoxEfiNetInterfaceConfigProtocolGuid = { 0xdc5800a1, 0xba61, 0x470b, { 0xb4, 0x0e, 0x6e, 0x24, 0x34, 0xd6, 0x71, 0x2b }}
+  gBlackBoxEfiPciIoProtocolGuid = { 0x4cf5b200, 0x68b8, 0x4ca5, { 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a }}
+  gBlackBoxEfiPciRootBridgeIoProtocolGuid = { 0x2f707ebb, 0x4a1a, 0x11d4, { 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiPlatformDriverOverrideProtocolGuid = { 0x6b30c738, 0xa391, 0x11d4, { 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiPlatformToDriverConfigurationProtocolGuid = { 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2, 0x3c, 0x4b }}
+  gBlackBoxEfiPlatformToDriverConfigurationClpGuid = { 0x345ecc0e, 0x0cb6, 0x4b75, { 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33, 0x3e }}
+  gBlackBoxEfiPxeBaseCodeProtocolGuid = { 0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiPxeBaseCodeCallbackProtocolGuid = { 0x245dca21, 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gBlackBoxEfiTapeIoProtocolGuid = { 0X1E93E633, 0XD65A, 0X459E, { 0XAB,0X84,0X93,0XD9,0XEC,0X26,0X6D,0X18 }}
+  gBlackBoxEfiTcp4ServiceBindingProtocolGuid = { 0x00720665, 0x67EB, 0x4a99, { 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9 }}
+  gBlackBoxEfiTcp4ProtocolGuid = { 0x65530BC7, 0xA359, 0x410f, { 0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62 }}
+  gBlackBoxEfiTcp6ServiceBindingProtocolGuid = { 0xec20eb79, 0x6c1a, 0x4664, { 0x9a, 0x0d, 0xd2, 0xe4, 0xcc, 0x16, 0xd6, 0x64 }}
+  gBlackBoxEfiTcp6ProtocolGuid = { 0x46e44855, 0xbd60, 0x4ab7, { 0xab, 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 }}
+  gBlackBoxEfiScsiIoProtocolGuid = { 0x932f47E6, 0x2362, 0x4002, { 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85 }}
+  gBlackBoxEfiScsiPassThruProtocolGuid = { 0xa59e8fcf, 0xbda0, 0x43bb, { 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 }}
+  gBlackBoxEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }}
+  gBlackBoxEfiSimpleFileSystemProtocolGuid = { 0x964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gBlackBoxEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
+  gBlackBoxEfiSimplePointerProtocolGuid = { 0xA19832B9, 0xAC25, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
+  gBlackBoxEfiSimpleTextInProtocolGuid = { 0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gBlackBoxEfiSimpleTextInputExProtocolGuid = { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa }}
   gBlackBoxEfiSimpleTextOutProtocolGuid = { 0x387477C2, 0x69C7, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
-  gBlackBoxEfiStorageSecurityCommandProtocolGuid = { 0xC88B0B6D, 0x0DFC, 0x49A7, {0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 } }
-  gBlackBoxEfiUdp4ServiceBindingProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5, {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 } }
-  gBlackBoxEfiUdp4ProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5, {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 } }
-  gBlackBoxEfiUdp6ServiceBindingProtocolGuid = { 0x66ed4721, 0x3c98, 0x4d3e, {0x81, 0xe3, 0xd0, 0x3d, 0xd3, 0x9a, 0x72, 0x54 } }
-  gBlackBoxEfiUdp6ProtocolGuid = { 0x4f948815, 0xb4b9, 0x43cb, {0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 } }
+  gBlackBoxEfiStorageSecurityCommandProtocolGuid = { 0xC88B0B6D, 0x0DFC, 0x49A7, { 0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 }}
+  gBlackBoxEfiUdp4ServiceBindingProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5, { 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }}
+  gBlackBoxEfiUdp4ProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5, { 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }}
+  gBlackBoxEfiUdp6ServiceBindingProtocolGuid = { 0x66ed4721, 0x3c98, 0x4d3e, { 0x81, 0xe3, 0xd0, 0x3d, 0xd3, 0x9a, 0x72, 0x54 }}
+  gBlackBoxEfiUdp6ProtocolGuid = { 0x4f948815, 0xb4b9, 0x43cb, { 0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 }}
   gBlackBoxEfiUgaDrawProtocolGuid = { 0x982C298B, 0xF4FA, 0x41CB, { 0xB8, 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }}
-  gBlackBoxEfiUnicodeCollationProtocolGuid = { 0x1d85cd7f, 0xf43d, 0x11d2, 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
-  gBlackBoxEfiUnicodeCollation2ProtocolGuid = { 0xa4c751fc, 0x23ae, 0x4c3e, 0x92, 0xe9,  0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }
-  gBlackBoxEfiUsb2HcProtocolGuid = { 0x3e745226, 0x9818, 0x45b6, 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc }
-  gBlackBoxEfiUsbHcProtocolGuid = {0xF5089266,0x1AA0,0x4953,0x97,0xD8,0x56,0x2F,0x8A,0x73,0xB5,0x19}
-  gBlackBoxEfiUsbIoProtocolGuid = {0x2B2F68D6,0x0CD2,0x44cf,0x8E,0x8B,0xBB,0xA2,0x0B,0x1B,0x5B,0x75}
-  gBlackBoxEfiVlanConfigProtocolGuid = { 0x9e23d768, 0xd2f3, 0x4366, 0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 }
+  gBlackBoxEfiUnicodeCollationProtocolGuid = { 0x1d85cd7f, 0xf43d, 0x11d2, { 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+  gBlackBoxEfiUnicodeCollation2ProtocolGuid = { 0xa4c751fc, 0x23ae, 0x4c3e, { 0x92, 0xe9,  0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}
+  gBlackBoxEfiUsb2HcProtocolGuid = { 0x3e745226, 0x9818, 0x45b6, { 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc }}
+  gBlackBoxEfiUsbHcProtocolGuid = { 0xF5089266, 0x1AA0, 0x4953, { 0x97, 0xD8, 0x56, 0x2F, 0x8A, 0x73, 0xB5, 0x19 }}
+  gBlackBoxEfiUsbIoProtocolGuid = { 0x2B2F68D6, 0x0CD2, 0x44cf, { 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }}
+  gBlackBoxEfiVlanConfigProtocolGuid = { 0x9e23d768, 0xd2f3, 0x4366, { 0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 }}
 
-  gBlackBoxEfiHash2ServiceBindingProtocolGuid = { 0xda836f8d, 0x217f, 0x4ca0, 0x99, 0xc2, 0x1c, 0xa4, 0xe1, 0x60, 0x77, 0xea }
-  gBlackBoxEfiHash2ProtocolGuid = { 0x55b1d734, 0xc5e1, 0x49db, 0x96, 0x47, 0xb1, 0x6a, 0xfb, 0xe, 0x30, 0x5b } 
+  gBlackBoxEfiHash2ServiceBindingProtocolGuid = { 0xda836f8d, 0x217f, 0x4ca0, { 0x99, 0xc2, 0x1c, 0xa4, 0xe1, 0x60, 0x77, 0xea }}
+  gBlackBoxEfiHash2ProtocolGuid = { 0x55b1d734, 0xc5e1, 0x49db, { 0x96, 0x47, 0xb1, 0x6a, 0xfb, 0xe, 0x30, 0x5b }}
 
-  gBlackBoxEfiPkcs7VerifyProtocolGuid = { 0x47889fb2, 0xd671, 0x4fab, 0xa0, 0xca, 0xdf, 0xe, 0x44, 0xdf, 0x70, 0xd6 }
+  gBlackBoxEfiPkcs7VerifyProtocolGuid = { 0x47889fb2, 0xd671, 0x4fab, { 0xa0, 0xca, 0xdf, 0xe, 0x44, 0xdf, 0x70, 0xd6 }}
   gBlackBoxEfiConfigKeywordHandlerProtocolGuid = { 0x0a8badd5, 0x03b8, 0x4d19, {0xb1, 0x28, 0x7b, 0x8f, 0x0e, 0xda, 0xa5, 0x96 }}
   gBlackBoxEfiNVMEPassThruProtocolGuid = { 0x52c78312, 0x8edc, 0x4233, {0x98, 0xf2, 0x1a, 0x1a, 0xa5, 0xe3, 0x88, 0xa5 }}
   gBlackBoxEfiRamDiskProtocolGuid = { 0xab38a0df, 0x6873, 0x44a9, { 0x87, 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }}
-  gBlackBoxEfiEraseBlockProtocolGuid = { 0x95a9a93e, 0xa86e, 0x4926, {0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87}}
+  gBlackBoxEfiEraseBlockProtocolGuid = { 0x95a9a93e, 0xa86e, 0x4926, { 0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87}}
   gBlackBoxEfiSDMMCPassThruProtocolGuid = { 0x716ef0d9, 0xff83, 0x4f69, { 0x81, 0xe9, 0x51, 0x8b, 0xd3, 0x9a, 0x8e, 0x70 }}
   gBlackBoxEfiPartitionInfoProtocolGuid = { 0x8cf2f62c, 0xbc9b, 0x4821, {0x80, 0x8d, 0xec, 0x9e, 0xc4, 0x21, 0xa1, 0xa0 }}
   gBlackBoxEfiUFSDeviceConfigProtocolGuid = { 0xb81bfab0, 0xeb3, 0x4cf9, { 0x84, 0x65, 0x7f, 0xa9, 0x86, 0x36, 0x16, 0x64 }}
-  gBlackBoxEfiResetNotificationProtocolGuid = { 0x9da34ae0, 0xeaf9, 0x4bbf, { 0x8e, 0xc3, 0xfd, 0x60, 0x22, 0x6c, 0x44, 0xbe } }
\ No newline at end of file
+  gBlackBoxEfiResetNotificationProtocolGuid = { 0x9da34ae0, 0xeaf9, 0x4bbf, { 0x8e, 0xc3, 0xfd, 0x60, 0x22, 0x6c, 0x44, 0xbe }}
-- 
2.7.4

Re: [edk2-test][PATCH] SctPkg/UEFI: Fix invalid GUID value format error

[Supreeth Venkatesh]

On Wed, 2018-11-28 at 20:35 +0000, Supreeth Venkatesh wrote:
On Wed, 2018-11-28 at 14:59 +0530, Lokesh B V wrote:
> Fix all GUID values that are defined with a invalid GUID
> value format.
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

Pushed.

> ---
>  uefi-sct/SctPkg/UEFI/UEFI.dec | 204 +++++++++++++++++++++-----------
> ----------
>  1 file changed, 102 insertions(+), 102 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-
> sct/SctPkg/UEFI/UEFI.dec
> index 14cc5b0..e3a6148 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, ARM Limited. All rights reserved. 
> +#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
>  #  Copyright (c) 2016 - 2018, Intel Corporation. All rights
> reserved.<BR>
>  #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
>  #
> @@ -44,25 +44,25 @@
>    
>  
>  [Guids.common]
> -  gBlackBoxEfiFileInfoGuid = { 0x9576e92, 0x6d3f, 0x11d2, 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiFileInfoIdGuid = { 0x9576e93, 0x6d3f, 0x11d2, 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> +  gBlackBoxEfiFileInfoGuid = { 0x9576e92, 0x6d3f, 0x11d2, { 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiFileInfoIdGuid = { 0x9576e93, 0x6d3f, 0x11d2, { 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
>    gBlackBoxEfiFileSystemInfoGuid = { 0x09576E93, 0x6D3F, 0x11D2, {
> 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
> -  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid = { 0xDB47D7D3,0xFE81,
> 0x11d3, 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
> -  gBlackBoxEfiTcp4RegistryDataGuid = { 0x755B4303, 0xCAA5, 0x4481,
> 0xB1, 0x3D, 0x07, 0xBE, 0x14, 0xD5, 0x4D, 0x3F}
> -  gBlackBoxEfiTcp6RegistryDataGuid = { 0x80623540, 0x7B41, 0x4306,
> 0x99, 0x87, 0x1B, 0xF6, 0xE5, 0xAD, 0x15, 0x3E }
> +  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid = { 0xDB47D7D3,
> 0xFE81, 0x11d3, { 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
> +  gBlackBoxEfiTcp4RegistryDataGuid = { 0x755B4303, 0xCAA5, 0x4481, {
> 0xB1, 0x3D, 0x07, 0xBE, 0x14, 0xD5, 0x4D, 0x3F }}
> +  gBlackBoxEfiTcp6RegistryDataGuid = { 0x80623540, 0x7B41, 0x4306, {
> 0x99, 0x87, 0x1B, 0xF6, 0xE5, 0xAD, 0x15, 0x3E }}
>    gBlackBoxEfiPcAnsiGuid = { 0xE0C14753, 0xF9BE, 0x11D2, { 0x9A,
> 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
>    gBlackBoxEfiVT100Guid = { 0xDFA66065, 0xB419, 0x11D3, { 0x9A,
> 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
>    gBlackBoxEfiVT100PlusGuid = { 0x7BAEC70B, 0x57E0, 0x4C76, { 0x8E,
> 0x87, 0x2F, 0x9E, 0x28, 0x08, 0x83, 0x43 }}
>    gBlackBoxEfiVTUTF8Guid = { 0xAD15A0D6, 0x8BEC, 0x4ACF, { 0xA0,
> 0x73, 0xD0, 0x1D, 0xE7, 0x7E, 0x2D, 0x88 }}
>  
> -  gBlackBoxEfiHash2AlgorithmSha1Guid = { 0x2ae9d80f, 0x3fb2, 0x4095,
> 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6 } 
> -  gBlackBoxEfiHash2AlgorithmSha224Guid = { 0x8df01a06, 0x9bd5,
> 0x4bf7, 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b }
> -  gBlackBoxEfiHash2AlgorithmSha256Guid = { 0x51aa59de, 0xfdf2,
> 0x4ea3, 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 }
> -  gBlackBoxEfiHash2AlgorithmSha384Guid = { 0xefa96432, 0xde33,
> 0x4dd2, 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a }
> -  gBlackBoxEfiHash2AlgorithmSha512Guid = { 0xcaa4381e, 0x750c,
> 0x4770, 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 }
> -  gBlackBoxEfiHash2AlgorithmMD5Guid = { 0xaf7c79c, 0x65b5, 0x4319,
> 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 }
> -  gBlackBoxEfiHash2AlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2,
> 0x40ca, 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }
> -  gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7,
> 0x4814, 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }
> +  gBlackBoxEfiHash2AlgorithmSha1Guid = { 0x2ae9d80f, 0x3fb2, 0x4095,
> { 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6 }}
> +  gBlackBoxEfiHash2AlgorithmSha224Guid = { 0x8df01a06, 0x9bd5,
> 0x4bf7, { 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b }}
> +  gBlackBoxEfiHash2AlgorithmSha256Guid = { 0x51aa59de, 0xfdf2,
> 0x4ea3, { 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 }}
> +  gBlackBoxEfiHash2AlgorithmSha384Guid = { 0xefa96432, 0xde33,
> 0x4dd2, { 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a }}
> +  gBlackBoxEfiHash2AlgorithmSha512Guid = { 0xcaa4381e, 0x750c,
> 0x4770, { 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 }}
> +  gBlackBoxEfiHash2AlgorithmMD5Guid = { 0xaf7c79c, 0x65b5, 0x4319, {
> 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 }}
> +  gBlackBoxEfiHash2AlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2,
> 0x40ca, { 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }}
> +  gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7,
> 0x4814, { 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }}
>  
>    
>    gBlackBoxEfiCertSha256Guid             = { 0xc1c41626, 0x504c,
> 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }} 
> @@ -79,109 +79,109 @@
>    gBlackBoxEfiPersistentVirtualCdGuid = { 0x08018188, 0x42CD,
> 0xBB48, {0x10, 0x0F, 0x53, 0x87, 0xD5, 0x3D, 0xED, 0x3D }}
>  
>  [Protocols.common]
> -  gBlackBoxEfiAbsolutePointerProtocolGuid = { 0x8D59D32B, 0xC655,
> 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 } }
> -  gBlackBoxEfiAcpiTableProtocolGuid = { 0xffe06bdd, 0x6107, 0x46a6,
> 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }
> -  gBlackBoxEfiArpProtocolGuid = { 0xf4b427bb, 0xba21, 0x4f16, 0xbc,
> 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }
> -  gBlackBoxEfiArpServiceBindingProtocolGuid = { 0xf44c00ee, 0x1f2c,
> 0x4a00, 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3 }
> -  gBlackBoxEfiAtaPassThruProtocolGuid = { 0x1d3de7f0, 0x807, 0x424f,
> {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f } }
> -  gBlackBoxEfiAuthenticationProtocolGuid = {0x7671d9d0, 0x52db,
> 0x4173, 0xaa,0x69,0x23,0x27,0xf2,0x1f,0x0b,0xc7}
> -  gBlackBoxEfiBisProtocolGuid = { 0x0b64aab0, 0x5429, 0x11d4, 0x98,
> 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf }
> +  gBlackBoxEfiAbsolutePointerProtocolGuid = { 0x8D59D32B, 0xC655,
> 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 }}
> +  gBlackBoxEfiAcpiTableProtocolGuid = { 0xffe06bdd, 0x6107, 0x46a6,
> { 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }}
> +  gBlackBoxEfiArpProtocolGuid = { 0xf4b427bb, 0xba21, 0x4f16, {
> 0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }}
> +  gBlackBoxEfiArpServiceBindingProtocolGuid = { 0xf44c00ee, 0x1f2c,
> 0x4a00, { 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3 }}
> +  gBlackBoxEfiAtaPassThruProtocolGuid = { 0x1d3de7f0, 0x807, 0x424f,
> {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f }}
> +  gBlackBoxEfiAuthenticationProtocolGuid = {0x7671d9d0, 0x52db,
> 0x4173, { 0xaa,0x69,0x23,0x27,0xf2,0x1f,0x0b,0xc7 }}
> +  gBlackBoxEfiBisProtocolGuid = { 0x0b64aab0, 0x5429, 0x11d4, {
> 0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf }}
>    gBlackBoxEfiBlockIoProtocolGuid = { 0x964e5b21, 0x6459, 0x11d2,
> {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
> -  gBlackBoxEfiBlockIo2ProtocolGuid = { 0xa77b2472, 0xe282, 0x4e9f,
> 0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }
> -  gBlackBoxEfiBusSpecificDriverOverrideProtocolGuid = { 0x3bc1b285,
> 0x8a15, 0x4a82, 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 }
> -  gBlackBoxEfiComponentNameProtocolGuid = { 0x107a772c, 0xd5e1,
> 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiComponentName2ProtocolGuid = { 0x6a7a5cff, 0xe8d9,
> 0x4f70, 0xba, 0xda, 0x75, 0xab, 0x30,0x25, 0xce, 0x14 }
> -  gBlackBoxEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC,
> 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }
> -  gBlackBoxEfiDebugSupportProtocolGuid = { 0x2755590C, 0x6F3C,
> 0x42FA, 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }
> -  gBlackBoxEfiDecompressProtocolGuid = { 0xd8117cfe, 0x94a6, 0x11d4,
> 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiDeviceIoProtocolGuid = { 0xaf6ac311, 0x84c3, 0x11d2,
> 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiDevicePathProtocolGuid = { 0x9576e91, 0x6d3f, 0x11d2,
> 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiDevicePathFromTextProtocolGuid = { 0x5c99a21, 0xc70f,
> 0x4ad2, 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e }
> -  gBlackBoxEfiDevicePathToTextProtocolGuid = { 0x8b843e20, 0x8132,
> 0x4852, 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c }
> -  gBlackBoxEfiDevicePathUtilitiesProtocolGuid = { 0x379be4e, 0xd706,
> 0x437d, 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4 }
> -  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid = {0x9d9a39d8, 0xbd42,
> 0x4a73, 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80}
> -  gBlackBoxEfiDhcp4ProtocolGuid             = { 0x8a219718, 0x4ef5,
> 0x4761,  0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56}
> -  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid = {0x9fb9a8a1, 0x2f4a,
> 0x43a6, 0x88, 0x9c, 0xd0, 0xf7, 0xb6, 0xc4, 0x7a, 0xd5}
> -  gBlackBoxEfiDhcp6ProtocolGuid             = {0x87c8bad7, 0x595,
> 0x4053, 0x82, 0x97, 0xde, 0xde, 0x39, 0x5f, 0x5d, 0x5b}
> -  gBlackBoxEfiDiskIoProtocolGuid = { 0xce345171, 0xba0b,
> 0x11d2,  0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> +  gBlackBoxEfiBlockIo2ProtocolGuid = { 0xa77b2472, 0xe282, 0x4e9f, {
> 0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }}
> +  gBlackBoxEfiBusSpecificDriverOverrideProtocolGuid = { 0x3bc1b285,
> 0x8a15, 0x4a82, { 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 }}
> +  gBlackBoxEfiComponentNameProtocolGuid = { 0x107a772c, 0xd5e1,
> 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiComponentName2ProtocolGuid = { 0x6a7a5cff, 0xe8d9,
> 0x4f70, { 0xba, 0xda, 0x75, 0xab, 0x30,0x25, 0xce, 0x14 }}
> +  gBlackBoxEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC,
> { 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }}
> +  gBlackBoxEfiDebugSupportProtocolGuid = { 0x2755590C, 0x6F3C,
> 0x42FA, { 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }}
> +  gBlackBoxEfiDecompressProtocolGuid = { 0xd8117cfe, 0x94a6, 0x11d4,
> { 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiDeviceIoProtocolGuid = { 0xaf6ac311, 0x84c3, 0x11d2, {
> 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiDevicePathProtocolGuid = { 0x9576e91, 0x6d3f, 0x11d2,
> { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiDevicePathFromTextProtocolGuid = { 0x5c99a21, 0xc70f,
> 0x4ad2, { 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e }}
> +  gBlackBoxEfiDevicePathToTextProtocolGuid = { 0x8b843e20, 0x8132,
> 0x4852, { 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c }}
> +  gBlackBoxEfiDevicePathUtilitiesProtocolGuid = { 0x379be4e, 0xd706,
> 0x437d, { 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4 }}
> +  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid = {0x9d9a39d8, 0xbd42,
> 0x4a73, { 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80 }}
> +  gBlackBoxEfiDhcp4ProtocolGuid             = { 0x8a219718, 0x4ef5,
> 0x4761,  { 0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56 }}
> +  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid = { 0x9fb9a8a1,
> 0x2f4a, 0x43a6, { 0x88, 0x9c, 0xd0, 0xf7, 0xb6, 0xc4, 0x7a, 0xd5 }}
> +  gBlackBoxEfiDhcp6ProtocolGuid             = { 0x87c8bad7, 0x595,
> 0x4053, { 0x82, 0x97, 0xde, 0xde, 0x39, 0x5f, 0x5d, 0x5b }}
> +  gBlackBoxEfiDiskIoProtocolGuid = { 0xce345171, 0xba0b, 0x11d2, {
> 0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
>    gBlackBoxEfiDiskIo2ProtocolGuid = { 0x151c8eae, 0x7f2c, 0x472c, {
> 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 }}
> -  gBlackBoxEfiDriverConfigurationProtocolGuid = { 0x107a772b,
> 0xd5e1, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiDriverDiagnosticsProtocolGuid = { 0x0784924f, 0xe296,
> 0x11d4, 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiDriverDiagnostics2ProtocolGuid = { 0x4d330321, 0x025f,
> 0x4aac, 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 }
> -  gBlackBoxEfiDriverSupportedEfiVersionProtocolGuid = { 0x5c198761,
> 0x16a8, 0x4e69, 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d }
> -  gBlackBoxEfiEbcProtocolGuid = {0x13AC6DD1, 0x73D0, 0x11D4, 0xB0,
> 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7}
> -  gBlackBoxEfiEbcDriverProtocolGuid = { 0xf01547c5, 0x6f06, 0x4c6d,
> 0xb6, 0x10, 0x88, 0x91, 0xe7, 0x74, 0x36, 0x45 }
> -  gBlackBoxEfiExtScsiPassThruProtocolGuid = { 0x143b7632, 0xb81b,
> 0x4cb7, {0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe }  }
> -  gBlackBoxEfiFirmwareManagementProtocolGuid = { 0x86c77a67, 0xb97,
> 0x4633, 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 }
> -  gBlackBoxEfiGraphicsOutputProtocolGuid = {0x9042a9de, 0x23dc,
> 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a}
> -  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}
> -  gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46,
> 0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }
> -  gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9,
> { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 } }
> -  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 }
> +  gBlackBoxEfiDriverConfigurationProtocolGuid = { 0x107a772b,
> 0xd5e1, 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiDriverDiagnosticsProtocolGuid = { 0x0784924f, 0xe296,
> 0x11d4, { 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiDriverDiagnostics2ProtocolGuid = { 0x4d330321, 0x025f,
> 0x4aac, { 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 }}
> +  gBlackBoxEfiDriverSupportedEfiVersionProtocolGuid = { 0x5c198761,
> 0x16a8, 0x4e69, { 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d }}
> +  gBlackBoxEfiEbcProtocolGuid = {0x13AC6DD1, 0x73D0, 0x11D4, { 0xB0,
> 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7 }}
> +  gBlackBoxEfiEbcDriverProtocolGuid = { 0xf01547c5, 0x6f06, 0x4c6d,
> { 0xb6, 0x10, 0x88, 0x91, 0xe7, 0x74, 0x36, 0x45 }}
> +  gBlackBoxEfiExtScsiPassThruProtocolGuid = { 0x143b7632, 0xb81b,
> 0x4cb7, { 0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe }}
> +  gBlackBoxEfiFirmwareManagementProtocolGuid = { 0x86c77a67, 0xb97,
> 0x4633, { 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 }}
> +  gBlackBoxEfiGraphicsOutputProtocolGuid = {0x9042a9de, 0x23dc,
> 0x4a38, { 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a }}
> +  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 }}
> +  gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46,
> {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
> +  gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9,
> { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
> +  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 } }
>    gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f,
> 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
>    gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6,
> 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
> -  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 } }
> +  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 }}
>    gBlackBoxEfiLoadedImageProtocolGuid = { 0x5B1B31A1, 0x9562,
> 0x11D2, { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
>    gBlackBoxEfiLoadedImageDevicePathProtocolGuid = {0xbc62157e,
> 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf }}
> -  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid = {
> 0xf36ff770, 0xa7e1, 0x42cf, 0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71,0xf4,
> 0x4c }
> -  gBlackBoxEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5,
> 0x4326, 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }
> -  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid = { 0x2FE800BE,
> 0x8F01, 0x4aa6, 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }
> -  gBlackBoxEfiMtftp4ProtocolGuid = { 0x78247c57, 0x63db, 0x4708,
> 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }
> -  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid = { 0xd9760ff3,
> 0x3cca, 0x4267, 0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 }
> -  gBlackBoxEfiMtftp6ProtocolGuid = { 0xbf0a78ba, 0xec29, 0x49cf,
> 0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 }
> -  gBlackBoxEfiNetInterfaceConfigProtocolGuid = { 0xdc5800a1, 0xba61,
> 0x470b, 0xb4, 0x0e, 0x6e, 0x24, 0x34, 0xd6, 0x71, 0x2b }
> -  gBlackBoxEfiPciIoProtocolGuid = { 0x4cf5b200, 0x68b8, 0x4ca5,
> 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a }
> -  gBlackBoxEfiPciRootBridgeIoProtocolGuid = { 0x2f707ebb, 0x4a1a,
> 0x11d4, 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiPlatformDriverOverrideProtocolGuid = { 0x6b30c738,
> 0xa391, 0x11d4, 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d}
> -  gBlackBoxEfiPlatformToDriverConfigurationProtocolGuid = {
> 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2,
> 0x3c, 0x4b} }
> -  gBlackBoxEfiPlatformToDriverConfigurationClpGuid = { 0x345ecc0e,
> 0x0cb6, 0x4b75, 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33, 0x3e }
> -  gBlackBoxEfiPxeBaseCodeProtocolGuid = { 0x03c4e603, 0xac28,
> 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }
> -  gBlackBoxEfiPxeBaseCodeCallbackProtocolGuid = { 0x245dca21,
> 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
> -  gBlackBoxEfiTapeIoProtocolGuid = {0X1E93E633, 0XD65A, 0X459E,
> 0XAB,0X84,0X93,0XD9,0XEC,0X26,0X6D,0X18}
> -  gBlackBoxEfiTcp4ServiceBindingProtocolGuid = { 0x00720665, 0x67EB,
> 0x4a99, 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9}
> -  gBlackBoxEfiTcp4ProtocolGuid = { 0x65530BC7, 0xA359, 0x410f, 0xB0,
> 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62}
> -  gBlackBoxEfiTcp6ServiceBindingProtocolGuid = { 0xec20eb79, 0x6c1a,
> 0x4664, 0x9a, 0x0d, 0xd2, 0xe4, 0xcc, 0x16, 0xd6, 0x64 }
> -  gBlackBoxEfiTcp6ProtocolGuid = { 0x46e44855, 0xbd60, 0x4ab7, 0xab,
> 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 }
> -  gBlackBoxEfiScsiIoProtocolGuid = { 0x932f47E6, 0x2362, 0x4002,
> 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85 }
> -  gBlackBoxEfiScsiPassThruProtocolGuid = { 0xa59e8fcf, 0xbda0,
> 0x43bb, 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 }
> -  gBlackBoxEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2,
> 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }
> -  gBlackBoxEfiSimpleFileSystemProtocolGuid = { 0x964e5b22, 0x6459,
> 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
> -  gBlackBoxEfiSimplePointerProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
> -  gBlackBoxEfiSimpleTextInProtocolGuid = { 0x387477c1, 0x69c7,
> 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} }
> -  gBlackBoxEfiSimpleTextInputExProtocolGuid = {0xdd9e7534, 0x7762,
> 0x4698, 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa}
> +  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid = {
> 0xf36ff770, 0xa7e1, 0x42cf, {0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71,0xf4,
> 0x4c }}
> +  gBlackBoxEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5,
> 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }}
> +  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid = { 0x2FE800BE,
> 0x8F01, 0x4aa6, { 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }}
> +  gBlackBoxEfiMtftp4ProtocolGuid = { 0x78247c57, 0x63db, 0x4708, {
> 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }}
> +  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid = { 0xd9760ff3,
> 0x3cca, 0x4267, { 0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 }}
> +  gBlackBoxEfiMtftp6ProtocolGuid = { 0xbf0a78ba, 0xec29, 0x49cf, {
> 0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 }}
> +  gBlackBoxEfiNetInterfaceConfigProtocolGuid = { 0xdc5800a1, 0xba61,
> 0x470b, { 0xb4, 0x0e, 0x6e, 0x24, 0x34, 0xd6, 0x71, 0x2b }}
> +  gBlackBoxEfiPciIoProtocolGuid = { 0x4cf5b200, 0x68b8, 0x4ca5, {
> 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a }}
> +  gBlackBoxEfiPciRootBridgeIoProtocolGuid = { 0x2f707ebb, 0x4a1a,
> 0x11d4, { 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiPlatformDriverOverrideProtocolGuid = { 0x6b30c738,
> 0xa391, 0x11d4, { 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiPlatformToDriverConfigurationProtocolGuid = {
> 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2,
> 0x3c, 0x4b }}
> +  gBlackBoxEfiPlatformToDriverConfigurationClpGuid = { 0x345ecc0e,
> 0x0cb6, 0x4b75, { 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33, 0x3e }}
> +  gBlackBoxEfiPxeBaseCodeProtocolGuid = { 0x03c4e603, 0xac28,
> 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiPxeBaseCodeCallbackProtocolGuid = { 0x245dca21,
> 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiTapeIoProtocolGuid = { 0X1E93E633, 0XD65A, 0X459E, {
> 0XAB,0X84,0X93,0XD9,0XEC,0X26,0X6D,0X18 }}
> +  gBlackBoxEfiTcp4ServiceBindingProtocolGuid = { 0x00720665, 0x67EB,
> 0x4a99, { 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9 }}
> +  gBlackBoxEfiTcp4ProtocolGuid = { 0x65530BC7, 0xA359, 0x410f, {
> 0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62 }}
> +  gBlackBoxEfiTcp6ServiceBindingProtocolGuid = { 0xec20eb79, 0x6c1a,
> 0x4664, { 0x9a, 0x0d, 0xd2, 0xe4, 0xcc, 0x16, 0xd6, 0x64 }}
> +  gBlackBoxEfiTcp6ProtocolGuid = { 0x46e44855, 0xbd60, 0x4ab7, {
> 0xab, 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 }}
> +  gBlackBoxEfiScsiIoProtocolGuid = { 0x932f47E6, 0x2362, 0x4002, {
> 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85 }}
> +  gBlackBoxEfiScsiPassThruProtocolGuid = { 0xa59e8fcf, 0xbda0,
> 0x43bb, { 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 }}
> +  gBlackBoxEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2, {
> 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }}
> +  gBlackBoxEfiSimpleFileSystemProtocolGuid = { 0x964e5b22, 0x6459,
> 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
> +  gBlackBoxEfiSimplePointerProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
> +  gBlackBoxEfiSimpleTextInProtocolGuid = { 0x387477c1, 0x69c7,
> 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiSimpleTextInputExProtocolGuid = { 0xdd9e7534, 0x7762,
> 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa }}
>    gBlackBoxEfiSimpleTextOutProtocolGuid = { 0x387477C2, 0x69C7,
> 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
> -  gBlackBoxEfiStorageSecurityCommandProtocolGuid = { 0xC88B0B6D,
> 0x0DFC, 0x49A7, {0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 } }
> -  gBlackBoxEfiUdp4ServiceBindingProtocolGuid = { 0x83f01464, 0x99bd,
> 0x45e5, {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 } }
> -  gBlackBoxEfiUdp4ProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5,
> {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 } }
> -  gBlackBoxEfiUdp6ServiceBindingProtocolGuid = { 0x66ed4721, 0x3c98,
> 0x4d3e, {0x81, 0xe3, 0xd0, 0x3d, 0xd3, 0x9a, 0x72, 0x54 } }
> -  gBlackBoxEfiUdp6ProtocolGuid = { 0x4f948815, 0xb4b9, 0x43cb,
> {0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 } }
> +  gBlackBoxEfiStorageSecurityCommandProtocolGuid = { 0xC88B0B6D,
> 0x0DFC, 0x49A7, { 0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 }}
> +  gBlackBoxEfiUdp4ServiceBindingProtocolGuid = { 0x83f01464, 0x99bd,
> 0x45e5, { 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }}
> +  gBlackBoxEfiUdp4ProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5, {
> 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }}
> +  gBlackBoxEfiUdp6ServiceBindingProtocolGuid = { 0x66ed4721, 0x3c98,
> 0x4d3e, { 0x81, 0xe3, 0xd0, 0x3d, 0xd3, 0x9a, 0x72, 0x54 }}
> +  gBlackBoxEfiUdp6ProtocolGuid = { 0x4f948815, 0xb4b9, 0x43cb, {
> 0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 }}
>    gBlackBoxEfiUgaDrawProtocolGuid = { 0x982C298B, 0xF4FA, 0x41CB, {
> 0xB8, 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }}
> -  gBlackBoxEfiUnicodeCollationProtocolGuid = { 0x1d85cd7f, 0xf43d,
> 0x11d2, 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiUnicodeCollation2ProtocolGuid = { 0xa4c751fc, 0x23ae,
> 0x4c3e, 0x92, 0xe9,  0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }
> -  gBlackBoxEfiUsb2HcProtocolGuid = { 0x3e745226, 0x9818, 0x45b6,
> 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc }
> -  gBlackBoxEfiUsbHcProtocolGuid =
> {0xF5089266,0x1AA0,0x4953,0x97,0xD8,0x56,0x2F,0x8A,0x73,0xB5,0x19}
> -  gBlackBoxEfiUsbIoProtocolGuid =
> {0x2B2F68D6,0x0CD2,0x44cf,0x8E,0x8B,0xBB,0xA2,0x0B,0x1B,0x5B,0x75}
> -  gBlackBoxEfiVlanConfigProtocolGuid = { 0x9e23d768, 0xd2f3, 0x4366,
> 0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 }
> +  gBlackBoxEfiUnicodeCollationProtocolGuid = { 0x1d85cd7f, 0xf43d,
> 0x11d2, { 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiUnicodeCollation2ProtocolGuid = { 0xa4c751fc, 0x23ae,
> 0x4c3e, { 0x92, 0xe9,  0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}
> +  gBlackBoxEfiUsb2HcProtocolGuid = { 0x3e745226, 0x9818, 0x45b6, {
> 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc }}
> +  gBlackBoxEfiUsbHcProtocolGuid = { 0xF5089266, 0x1AA0, 0x4953, {
> 0x97, 0xD8, 0x56, 0x2F, 0x8A, 0x73, 0xB5, 0x19 }}
> +  gBlackBoxEfiUsbIoProtocolGuid = { 0x2B2F68D6, 0x0CD2, 0x44cf, {
> 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }}
> +  gBlackBoxEfiVlanConfigProtocolGuid = { 0x9e23d768, 0xd2f3, 0x4366,
> { 0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 }}
>  
> -  gBlackBoxEfiHash2ServiceBindingProtocolGuid = { 0xda836f8d,
> 0x217f, 0x4ca0, 0x99, 0xc2, 0x1c, 0xa4, 0xe1, 0x60, 0x77, 0xea }
> -  gBlackBoxEfiHash2ProtocolGuid = { 0x55b1d734, 0xc5e1, 0x49db,
> 0x96, 0x47, 0xb1, 0x6a, 0xfb, 0xe, 0x30, 0x5b } 
> +  gBlackBoxEfiHash2ServiceBindingProtocolGuid = { 0xda836f8d,
> 0x217f, 0x4ca0, { 0x99, 0xc2, 0x1c, 0xa4, 0xe1, 0x60, 0x77, 0xea }}
> +  gBlackBoxEfiHash2ProtocolGuid = { 0x55b1d734, 0xc5e1, 0x49db, {
> 0x96, 0x47, 0xb1, 0x6a, 0xfb, 0xe, 0x30, 0x5b }}
>  
> -  gBlackBoxEfiPkcs7VerifyProtocolGuid = { 0x47889fb2, 0xd671,
> 0x4fab, 0xa0, 0xca, 0xdf, 0xe, 0x44, 0xdf, 0x70, 0xd6 }
> +  gBlackBoxEfiPkcs7VerifyProtocolGuid = { 0x47889fb2, 0xd671,
> 0x4fab, { 0xa0, 0xca, 0xdf, 0xe, 0x44, 0xdf, 0x70, 0xd6 }}
>    gBlackBoxEfiConfigKeywordHandlerProtocolGuid = { 0x0a8badd5,
> 0x03b8, 0x4d19, {0xb1, 0x28, 0x7b, 0x8f, 0x0e, 0xda, 0xa5, 0x96 }}
>    gBlackBoxEfiNVMEPassThruProtocolGuid = { 0x52c78312, 0x8edc,
> 0x4233, {0x98, 0xf2, 0x1a, 0x1a, 0xa5, 0xe3, 0x88, 0xa5 }}
>    gBlackBoxEfiRamDiskProtocolGuid = { 0xab38a0df, 0x6873, 0x44a9, {
> 0x87, 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }}
> -  gBlackBoxEfiEraseBlockProtocolGuid = { 0x95a9a93e, 0xa86e, 0x4926,
> {0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87}}
> +  gBlackBoxEfiEraseBlockProtocolGuid = { 0x95a9a93e, 0xa86e, 0x4926,
> { 0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87}}
>    gBlackBoxEfiSDMMCPassThruProtocolGuid = { 0x716ef0d9, 0xff83,
> 0x4f69, { 0x81, 0xe9, 0x51, 0x8b, 0xd3, 0x9a, 0x8e, 0x70 }}
>    gBlackBoxEfiPartitionInfoProtocolGuid = { 0x8cf2f62c, 0xbc9b,
> 0x4821, {0x80, 0x8d, 0xec, 0x9e, 0xc4, 0x21, 0xa1, 0xa0 }}
>    gBlackBoxEfiUFSDeviceConfigProtocolGuid = { 0xb81bfab0, 0xeb3,
> 0x4cf9, { 0x84, 0x65, 0x7f, 0xa9, 0x86, 0x36, 0x16, 0x64 }}
> -  gBlackBoxEfiResetNotificationProtocolGuid = { 0x9da34ae0, 0xeaf9,
> 0x4bbf, { 0x8e, 0xc3, 0xfd, 0x60, 0x22, 0x6c, 0x44, 0xbe } }
> \ No newline at end of file
> +  gBlackBoxEfiResetNotificationProtocolGuid = { 0x9da34ae0, 0xeaf9,
> 0x4bbf, { 0x8e, 0xc3, 0xfd, 0x60, 0x22, 0x6c, 0x44, 0xbe }}

Re: [edk2-test][PATCH] SctPkg/UEFI: Fix invalid GUID value format error

[Supreeth Venkatesh]

On Wed, 2018-11-28 at 14:59 +0530, Lokesh B V wrote:
> Fix all GUID values that are defined with a invalid GUID
> value format.
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

Pushed.

> ---
>  uefi-sct/SctPkg/UEFI/UEFI.dec | 204 +++++++++++++++++++++-----------
> ----------
>  1 file changed, 102 insertions(+), 102 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-
> sct/SctPkg/UEFI/UEFI.dec
> index 14cc5b0..e3a6148 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, ARM Limited. All rights reserved. 
> +#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
>  #  Copyright (c) 2016 - 2018, Intel Corporation. All rights
> reserved.<BR>
>  #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
>  #
> @@ -44,25 +44,25 @@
>    
>  
>  [Guids.common]
> -  gBlackBoxEfiFileInfoGuid = { 0x9576e92, 0x6d3f, 0x11d2, 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiFileInfoIdGuid = { 0x9576e93, 0x6d3f, 0x11d2, 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> +  gBlackBoxEfiFileInfoGuid = { 0x9576e92, 0x6d3f, 0x11d2, { 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiFileInfoIdGuid = { 0x9576e93, 0x6d3f, 0x11d2, { 0x8e,
> 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
>    gBlackBoxEfiFileSystemInfoGuid = { 0x09576E93, 0x6D3F, 0x11D2, {
> 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
> -  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid = { 0xDB47D7D3,0xFE81,
> 0x11d3, 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
> -  gBlackBoxEfiTcp4RegistryDataGuid = { 0x755B4303, 0xCAA5, 0x4481,
> 0xB1, 0x3D, 0x07, 0xBE, 0x14, 0xD5, 0x4D, 0x3F}
> -  gBlackBoxEfiTcp6RegistryDataGuid = { 0x80623540, 0x7B41, 0x4306,
> 0x99, 0x87, 0x1B, 0xF6, 0xE5, 0xAD, 0x15, 0x3E }
> +  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid = { 0xDB47D7D3,
> 0xFE81, 0x11d3, { 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
> +  gBlackBoxEfiTcp4RegistryDataGuid = { 0x755B4303, 0xCAA5, 0x4481, {
> 0xB1, 0x3D, 0x07, 0xBE, 0x14, 0xD5, 0x4D, 0x3F }}
> +  gBlackBoxEfiTcp6RegistryDataGuid = { 0x80623540, 0x7B41, 0x4306, {
> 0x99, 0x87, 0x1B, 0xF6, 0xE5, 0xAD, 0x15, 0x3E }}
>    gBlackBoxEfiPcAnsiGuid = { 0xE0C14753, 0xF9BE, 0x11D2, { 0x9A,
> 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
>    gBlackBoxEfiVT100Guid = { 0xDFA66065, 0xB419, 0x11D3, { 0x9A,
> 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
>    gBlackBoxEfiVT100PlusGuid = { 0x7BAEC70B, 0x57E0, 0x4C76, { 0x8E,
> 0x87, 0x2F, 0x9E, 0x28, 0x08, 0x83, 0x43 }}
>    gBlackBoxEfiVTUTF8Guid = { 0xAD15A0D6, 0x8BEC, 0x4ACF, { 0xA0,
> 0x73, 0xD0, 0x1D, 0xE7, 0x7E, 0x2D, 0x88 }}
>  
> -  gBlackBoxEfiHash2AlgorithmSha1Guid = { 0x2ae9d80f, 0x3fb2, 0x4095,
> 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6 } 
> -  gBlackBoxEfiHash2AlgorithmSha224Guid = { 0x8df01a06, 0x9bd5,
> 0x4bf7, 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b }
> -  gBlackBoxEfiHash2AlgorithmSha256Guid = { 0x51aa59de, 0xfdf2,
> 0x4ea3, 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 }
> -  gBlackBoxEfiHash2AlgorithmSha384Guid = { 0xefa96432, 0xde33,
> 0x4dd2, 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a }
> -  gBlackBoxEfiHash2AlgorithmSha512Guid = { 0xcaa4381e, 0x750c,
> 0x4770, 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 }
> -  gBlackBoxEfiHash2AlgorithmMD5Guid = { 0xaf7c79c, 0x65b5, 0x4319,
> 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 }
> -  gBlackBoxEfiHash2AlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2,
> 0x40ca, 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }
> -  gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7,
> 0x4814, 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }
> +  gBlackBoxEfiHash2AlgorithmSha1Guid = { 0x2ae9d80f, 0x3fb2, 0x4095,
> { 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6 }}
> +  gBlackBoxEfiHash2AlgorithmSha224Guid = { 0x8df01a06, 0x9bd5,
> 0x4bf7, { 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b }}
> +  gBlackBoxEfiHash2AlgorithmSha256Guid = { 0x51aa59de, 0xfdf2,
> 0x4ea3, { 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9 }}
> +  gBlackBoxEfiHash2AlgorithmSha384Guid = { 0xefa96432, 0xde33,
> 0x4dd2, { 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a }}
> +  gBlackBoxEfiHash2AlgorithmSha512Guid = { 0xcaa4381e, 0x750c,
> 0x4770, { 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 }}
> +  gBlackBoxEfiHash2AlgorithmMD5Guid = { 0xaf7c79c, 0x65b5, 0x4319, {
> 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 }}
> +  gBlackBoxEfiHash2AlgorithmSha1NoPadGuid = { 0x24c5dc2f, 0x53e2,
> 0x40ca, { 0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46, 0x3b }}
> +  gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = { 0x8628752a, 0x6cb7,
> 0x4814, { 0x96, 0xfc, 0x24, 0xa8, 0x15, 0xac, 0x22, 0x26 }}
>  
>    
>    gBlackBoxEfiCertSha256Guid             = { 0xc1c41626, 0x504c,
> 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }} 
> @@ -79,109 +79,109 @@
>    gBlackBoxEfiPersistentVirtualCdGuid = { 0x08018188, 0x42CD,
> 0xBB48, {0x10, 0x0F, 0x53, 0x87, 0xD5, 0x3D, 0xED, 0x3D }}
>  
>  [Protocols.common]
> -  gBlackBoxEfiAbsolutePointerProtocolGuid = { 0x8D59D32B, 0xC655,
> 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 } }
> -  gBlackBoxEfiAcpiTableProtocolGuid = { 0xffe06bdd, 0x6107, 0x46a6,
> 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }
> -  gBlackBoxEfiArpProtocolGuid = { 0xf4b427bb, 0xba21, 0x4f16, 0xbc,
> 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }
> -  gBlackBoxEfiArpServiceBindingProtocolGuid = { 0xf44c00ee, 0x1f2c,
> 0x4a00, 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3 }
> -  gBlackBoxEfiAtaPassThruProtocolGuid = { 0x1d3de7f0, 0x807, 0x424f,
> {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f } }
> -  gBlackBoxEfiAuthenticationProtocolGuid = {0x7671d9d0, 0x52db,
> 0x4173, 0xaa,0x69,0x23,0x27,0xf2,0x1f,0x0b,0xc7}
> -  gBlackBoxEfiBisProtocolGuid = { 0x0b64aab0, 0x5429, 0x11d4, 0x98,
> 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf }
> +  gBlackBoxEfiAbsolutePointerProtocolGuid = { 0x8D59D32B, 0xC655,
> 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 }}
> +  gBlackBoxEfiAcpiTableProtocolGuid = { 0xffe06bdd, 0x6107, 0x46a6,
> { 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }}
> +  gBlackBoxEfiArpProtocolGuid = { 0xf4b427bb, 0xba21, 0x4f16, {
> 0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }}
> +  gBlackBoxEfiArpServiceBindingProtocolGuid = { 0xf44c00ee, 0x1f2c,
> 0x4a00, { 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3 }}
> +  gBlackBoxEfiAtaPassThruProtocolGuid = { 0x1d3de7f0, 0x807, 0x424f,
> {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f }}
> +  gBlackBoxEfiAuthenticationProtocolGuid = {0x7671d9d0, 0x52db,
> 0x4173, { 0xaa,0x69,0x23,0x27,0xf2,0x1f,0x0b,0xc7 }}
> +  gBlackBoxEfiBisProtocolGuid = { 0x0b64aab0, 0x5429, 0x11d4, {
> 0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf }}
>    gBlackBoxEfiBlockIoProtocolGuid = { 0x964e5b21, 0x6459, 0x11d2,
> {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
> -  gBlackBoxEfiBlockIo2ProtocolGuid = { 0xa77b2472, 0xe282, 0x4e9f,
> 0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }
> -  gBlackBoxEfiBusSpecificDriverOverrideProtocolGuid = { 0x3bc1b285,
> 0x8a15, 0x4a82, 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 }
> -  gBlackBoxEfiComponentNameProtocolGuid = { 0x107a772c, 0xd5e1,
> 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiComponentName2ProtocolGuid = { 0x6a7a5cff, 0xe8d9,
> 0x4f70, 0xba, 0xda, 0x75, 0xab, 0x30,0x25, 0xce, 0x14 }
> -  gBlackBoxEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC,
> 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }
> -  gBlackBoxEfiDebugSupportProtocolGuid = { 0x2755590C, 0x6F3C,
> 0x42FA, 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }
> -  gBlackBoxEfiDecompressProtocolGuid = { 0xd8117cfe, 0x94a6, 0x11d4,
> 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiDeviceIoProtocolGuid = { 0xaf6ac311, 0x84c3, 0x11d2,
> 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiDevicePathProtocolGuid = { 0x9576e91, 0x6d3f, 0x11d2,
> 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiDevicePathFromTextProtocolGuid = { 0x5c99a21, 0xc70f,
> 0x4ad2, 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e }
> -  gBlackBoxEfiDevicePathToTextProtocolGuid = { 0x8b843e20, 0x8132,
> 0x4852, 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c }
> -  gBlackBoxEfiDevicePathUtilitiesProtocolGuid = { 0x379be4e, 0xd706,
> 0x437d, 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4 }
> -  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid = {0x9d9a39d8, 0xbd42,
> 0x4a73, 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80}
> -  gBlackBoxEfiDhcp4ProtocolGuid             = { 0x8a219718, 0x4ef5,
> 0x4761,  0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56}
> -  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid = {0x9fb9a8a1, 0x2f4a,
> 0x43a6, 0x88, 0x9c, 0xd0, 0xf7, 0xb6, 0xc4, 0x7a, 0xd5}
> -  gBlackBoxEfiDhcp6ProtocolGuid             = {0x87c8bad7, 0x595,
> 0x4053, 0x82, 0x97, 0xde, 0xde, 0x39, 0x5f, 0x5d, 0x5b}
> -  gBlackBoxEfiDiskIoProtocolGuid = { 0xce345171, 0xba0b,
> 0x11d2,  0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> +  gBlackBoxEfiBlockIo2ProtocolGuid = { 0xa77b2472, 0xe282, 0x4e9f, {
> 0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }}
> +  gBlackBoxEfiBusSpecificDriverOverrideProtocolGuid = { 0x3bc1b285,
> 0x8a15, 0x4a82, { 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 }}
> +  gBlackBoxEfiComponentNameProtocolGuid = { 0x107a772c, 0xd5e1,
> 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiComponentName2ProtocolGuid = { 0x6a7a5cff, 0xe8d9,
> 0x4f70, { 0xba, 0xda, 0x75, 0xab, 0x30,0x25, 0xce, 0x14 }}
> +  gBlackBoxEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC,
> { 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }}
> +  gBlackBoxEfiDebugSupportProtocolGuid = { 0x2755590C, 0x6F3C,
> 0x42FA, { 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }}
> +  gBlackBoxEfiDecompressProtocolGuid = { 0xd8117cfe, 0x94a6, 0x11d4,
> { 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiDeviceIoProtocolGuid = { 0xaf6ac311, 0x84c3, 0x11d2, {
> 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiDevicePathProtocolGuid = { 0x9576e91, 0x6d3f, 0x11d2,
> { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiDevicePathFromTextProtocolGuid = { 0x5c99a21, 0xc70f,
> 0x4ad2, { 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e }}
> +  gBlackBoxEfiDevicePathToTextProtocolGuid = { 0x8b843e20, 0x8132,
> 0x4852, { 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c }}
> +  gBlackBoxEfiDevicePathUtilitiesProtocolGuid = { 0x379be4e, 0xd706,
> 0x437d, { 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4 }}
> +  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid = {0x9d9a39d8, 0xbd42,
> 0x4a73, { 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80 }}
> +  gBlackBoxEfiDhcp4ProtocolGuid             = { 0x8a219718, 0x4ef5,
> 0x4761,  { 0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56 }}
> +  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid = { 0x9fb9a8a1,
> 0x2f4a, 0x43a6, { 0x88, 0x9c, 0xd0, 0xf7, 0xb6, 0xc4, 0x7a, 0xd5 }}
> +  gBlackBoxEfiDhcp6ProtocolGuid             = { 0x87c8bad7, 0x595,
> 0x4053, { 0x82, 0x97, 0xde, 0xde, 0x39, 0x5f, 0x5d, 0x5b }}
> +  gBlackBoxEfiDiskIoProtocolGuid = { 0xce345171, 0xba0b, 0x11d2, {
> 0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
>    gBlackBoxEfiDiskIo2ProtocolGuid = { 0x151c8eae, 0x7f2c, 0x472c, {
> 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 }}
> -  gBlackBoxEfiDriverConfigurationProtocolGuid = { 0x107a772b,
> 0xd5e1, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiDriverDiagnosticsProtocolGuid = { 0x0784924f, 0xe296,
> 0x11d4, 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiDriverDiagnostics2ProtocolGuid = { 0x4d330321, 0x025f,
> 0x4aac, 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 }
> -  gBlackBoxEfiDriverSupportedEfiVersionProtocolGuid = { 0x5c198761,
> 0x16a8, 0x4e69, 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d }
> -  gBlackBoxEfiEbcProtocolGuid = {0x13AC6DD1, 0x73D0, 0x11D4, 0xB0,
> 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7}
> -  gBlackBoxEfiEbcDriverProtocolGuid = { 0xf01547c5, 0x6f06, 0x4c6d,
> 0xb6, 0x10, 0x88, 0x91, 0xe7, 0x74, 0x36, 0x45 }
> -  gBlackBoxEfiExtScsiPassThruProtocolGuid = { 0x143b7632, 0xb81b,
> 0x4cb7, {0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe }  }
> -  gBlackBoxEfiFirmwareManagementProtocolGuid = { 0x86c77a67, 0xb97,
> 0x4633, 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 }
> -  gBlackBoxEfiGraphicsOutputProtocolGuid = {0x9042a9de, 0x23dc,
> 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a}
> -  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}
> -  gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46,
> 0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }
> -  gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9,
> { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 } }
> -  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 }
> +  gBlackBoxEfiDriverConfigurationProtocolGuid = { 0x107a772b,
> 0xd5e1, 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiDriverDiagnosticsProtocolGuid = { 0x0784924f, 0xe296,
> 0x11d4, { 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiDriverDiagnostics2ProtocolGuid = { 0x4d330321, 0x025f,
> 0x4aac, { 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 }}
> +  gBlackBoxEfiDriverSupportedEfiVersionProtocolGuid = { 0x5c198761,
> 0x16a8, 0x4e69, { 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d }}
> +  gBlackBoxEfiEbcProtocolGuid = {0x13AC6DD1, 0x73D0, 0x11D4, { 0xB0,
> 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7 }}
> +  gBlackBoxEfiEbcDriverProtocolGuid = { 0xf01547c5, 0x6f06, 0x4c6d,
> { 0xb6, 0x10, 0x88, 0x91, 0xe7, 0x74, 0x36, 0x45 }}
> +  gBlackBoxEfiExtScsiPassThruProtocolGuid = { 0x143b7632, 0xb81b,
> 0x4cb7, { 0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe }}
> +  gBlackBoxEfiFirmwareManagementProtocolGuid = { 0x86c77a67, 0xb97,
> 0x4633, { 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 }}
> +  gBlackBoxEfiGraphicsOutputProtocolGuid = {0x9042a9de, 0x23dc,
> 0x4a38, { 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a }}
> +  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 }}
> +  gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46,
> {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
> +  gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9,
> { 0xbc, 0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
> +  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 } }
>    gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f,
> 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
>    gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6,
> 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
> -  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 } }
> +  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 }}
>    gBlackBoxEfiLoadedImageProtocolGuid = { 0x5B1B31A1, 0x9562,
> 0x11D2, { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
>    gBlackBoxEfiLoadedImageDevicePathProtocolGuid = {0xbc62157e,
> 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf }}
> -  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid = {
> 0xf36ff770, 0xa7e1, 0x42cf, 0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71,0xf4,
> 0x4c }
> -  gBlackBoxEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5,
> 0x4326, 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }
> -  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid = { 0x2FE800BE,
> 0x8F01, 0x4aa6, 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }
> -  gBlackBoxEfiMtftp4ProtocolGuid = { 0x78247c57, 0x63db, 0x4708,
> 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }
> -  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid = { 0xd9760ff3,
> 0x3cca, 0x4267, 0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 }
> -  gBlackBoxEfiMtftp6ProtocolGuid = { 0xbf0a78ba, 0xec29, 0x49cf,
> 0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 }
> -  gBlackBoxEfiNetInterfaceConfigProtocolGuid = { 0xdc5800a1, 0xba61,
> 0x470b, 0xb4, 0x0e, 0x6e, 0x24, 0x34, 0xd6, 0x71, 0x2b }
> -  gBlackBoxEfiPciIoProtocolGuid = { 0x4cf5b200, 0x68b8, 0x4ca5,
> 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a }
> -  gBlackBoxEfiPciRootBridgeIoProtocolGuid = { 0x2f707ebb, 0x4a1a,
> 0x11d4, 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiPlatformDriverOverrideProtocolGuid = { 0x6b30c738,
> 0xa391, 0x11d4, 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d}
> -  gBlackBoxEfiPlatformToDriverConfigurationProtocolGuid = {
> 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2,
> 0x3c, 0x4b} }
> -  gBlackBoxEfiPlatformToDriverConfigurationClpGuid = { 0x345ecc0e,
> 0x0cb6, 0x4b75, 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33, 0x3e }
> -  gBlackBoxEfiPxeBaseCodeProtocolGuid = { 0x03c4e603, 0xac28,
> 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }
> -  gBlackBoxEfiPxeBaseCodeCallbackProtocolGuid = { 0x245dca21,
> 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
> -  gBlackBoxEfiTapeIoProtocolGuid = {0X1E93E633, 0XD65A, 0X459E,
> 0XAB,0X84,0X93,0XD9,0XEC,0X26,0X6D,0X18}
> -  gBlackBoxEfiTcp4ServiceBindingProtocolGuid = { 0x00720665, 0x67EB,
> 0x4a99, 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9}
> -  gBlackBoxEfiTcp4ProtocolGuid = { 0x65530BC7, 0xA359, 0x410f, 0xB0,
> 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62}
> -  gBlackBoxEfiTcp6ServiceBindingProtocolGuid = { 0xec20eb79, 0x6c1a,
> 0x4664, 0x9a, 0x0d, 0xd2, 0xe4, 0xcc, 0x16, 0xd6, 0x64 }
> -  gBlackBoxEfiTcp6ProtocolGuid = { 0x46e44855, 0xbd60, 0x4ab7, 0xab,
> 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 }
> -  gBlackBoxEfiScsiIoProtocolGuid = { 0x932f47E6, 0x2362, 0x4002,
> 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85 }
> -  gBlackBoxEfiScsiPassThruProtocolGuid = { 0xa59e8fcf, 0xbda0,
> 0x43bb, 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 }
> -  gBlackBoxEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2,
> 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }
> -  gBlackBoxEfiSimpleFileSystemProtocolGuid = { 0x964e5b22, 0x6459,
> 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
> -  gBlackBoxEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
> -  gBlackBoxEfiSimplePointerProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
> -  gBlackBoxEfiSimpleTextInProtocolGuid = { 0x387477c1, 0x69c7,
> 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} }
> -  gBlackBoxEfiSimpleTextInputExProtocolGuid = {0xdd9e7534, 0x7762,
> 0x4698, 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa}
> +  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid = {
> 0xf36ff770, 0xa7e1, 0x42cf, {0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71,0xf4,
> 0x4c }}
> +  gBlackBoxEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5,
> 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }}
> +  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid = { 0x2FE800BE,
> 0x8F01, 0x4aa6, { 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }}
> +  gBlackBoxEfiMtftp4ProtocolGuid = { 0x78247c57, 0x63db, 0x4708, {
> 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }}
> +  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid = { 0xd9760ff3,
> 0x3cca, 0x4267, { 0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 }}
> +  gBlackBoxEfiMtftp6ProtocolGuid = { 0xbf0a78ba, 0xec29, 0x49cf, {
> 0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 }}
> +  gBlackBoxEfiNetInterfaceConfigProtocolGuid = { 0xdc5800a1, 0xba61,
> 0x470b, { 0xb4, 0x0e, 0x6e, 0x24, 0x34, 0xd6, 0x71, 0x2b }}
> +  gBlackBoxEfiPciIoProtocolGuid = { 0x4cf5b200, 0x68b8, 0x4ca5, {
> 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a }}
> +  gBlackBoxEfiPciRootBridgeIoProtocolGuid = { 0x2f707ebb, 0x4a1a,
> 0x11d4, { 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiPlatformDriverOverrideProtocolGuid = { 0x6b30c738,
> 0xa391, 0x11d4, { 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiPlatformToDriverConfigurationProtocolGuid = {
> 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2,
> 0x3c, 0x4b }}
> +  gBlackBoxEfiPlatformToDriverConfigurationClpGuid = { 0x345ecc0e,
> 0x0cb6, 0x4b75, { 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33, 0x3e }}
> +  gBlackBoxEfiPxeBaseCodeProtocolGuid = { 0x03c4e603, 0xac28,
> 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiPxeBaseCodeCallbackProtocolGuid = { 0x245dca21,
> 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiTapeIoProtocolGuid = { 0X1E93E633, 0XD65A, 0X459E, {
> 0XAB,0X84,0X93,0XD9,0XEC,0X26,0X6D,0X18 }}
> +  gBlackBoxEfiTcp4ServiceBindingProtocolGuid = { 0x00720665, 0x67EB,
> 0x4a99, { 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9 }}
> +  gBlackBoxEfiTcp4ProtocolGuid = { 0x65530BC7, 0xA359, 0x410f, {
> 0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62 }}
> +  gBlackBoxEfiTcp6ServiceBindingProtocolGuid = { 0xec20eb79, 0x6c1a,
> 0x4664, { 0x9a, 0x0d, 0xd2, 0xe4, 0xcc, 0x16, 0xd6, 0x64 }}
> +  gBlackBoxEfiTcp6ProtocolGuid = { 0x46e44855, 0xbd60, 0x4ab7, {
> 0xab, 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 }}
> +  gBlackBoxEfiScsiIoProtocolGuid = { 0x932f47E6, 0x2362, 0x4002, {
> 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85 }}
> +  gBlackBoxEfiScsiPassThruProtocolGuid = { 0xa59e8fcf, 0xbda0,
> 0x43bb, { 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 }}
> +  gBlackBoxEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2, {
> 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }}
> +  gBlackBoxEfiSimpleFileSystemProtocolGuid = { 0x964e5b22, 0x6459,
> 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
> +  gBlackBoxEfiSimplePointerProtocolGuid = { 0xA19832B9, 0xAC25,
> 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
> +  gBlackBoxEfiSimpleTextInProtocolGuid = { 0x387477c1, 0x69c7,
> 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
> +  gBlackBoxEfiSimpleTextInputExProtocolGuid = { 0xdd9e7534, 0x7762,
> 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa }}
>    gBlackBoxEfiSimpleTextOutProtocolGuid = { 0x387477C2, 0x69C7,
> 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}
> -  gBlackBoxEfiStorageSecurityCommandProtocolGuid = { 0xC88B0B6D,
> 0x0DFC, 0x49A7, {0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 } }
> -  gBlackBoxEfiUdp4ServiceBindingProtocolGuid = { 0x83f01464, 0x99bd,
> 0x45e5, {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 } }
> -  gBlackBoxEfiUdp4ProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5,
> {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 } }
> -  gBlackBoxEfiUdp6ServiceBindingProtocolGuid = { 0x66ed4721, 0x3c98,
> 0x4d3e, {0x81, 0xe3, 0xd0, 0x3d, 0xd3, 0x9a, 0x72, 0x54 } }
> -  gBlackBoxEfiUdp6ProtocolGuid = { 0x4f948815, 0xb4b9, 0x43cb,
> {0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 } }
> +  gBlackBoxEfiStorageSecurityCommandProtocolGuid = { 0xC88B0B6D,
> 0x0DFC, 0x49A7, { 0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 }}
> +  gBlackBoxEfiUdp4ServiceBindingProtocolGuid = { 0x83f01464, 0x99bd,
> 0x45e5, { 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }}
> +  gBlackBoxEfiUdp4ProtocolGuid = { 0x83f01464, 0x99bd, 0x45e5, {
> 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }}
> +  gBlackBoxEfiUdp6ServiceBindingProtocolGuid = { 0x66ed4721, 0x3c98,
> 0x4d3e, { 0x81, 0xe3, 0xd0, 0x3d, 0xd3, 0x9a, 0x72, 0x54 }}
> +  gBlackBoxEfiUdp6ProtocolGuid = { 0x4f948815, 0xb4b9, 0x43cb, {
> 0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 }}
>    gBlackBoxEfiUgaDrawProtocolGuid = { 0x982C298B, 0xF4FA, 0x41CB, {
> 0xB8, 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }}
> -  gBlackBoxEfiUnicodeCollationProtocolGuid = { 0x1d85cd7f, 0xf43d,
> 0x11d2, 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
> -  gBlackBoxEfiUnicodeCollation2ProtocolGuid = { 0xa4c751fc, 0x23ae,
> 0x4c3e, 0x92, 0xe9,  0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }
> -  gBlackBoxEfiUsb2HcProtocolGuid = { 0x3e745226, 0x9818, 0x45b6,
> 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc }
> -  gBlackBoxEfiUsbHcProtocolGuid =
> {0xF5089266,0x1AA0,0x4953,0x97,0xD8,0x56,0x2F,0x8A,0x73,0xB5,0x19}
> -  gBlackBoxEfiUsbIoProtocolGuid =
> {0x2B2F68D6,0x0CD2,0x44cf,0x8E,0x8B,0xBB,0xA2,0x0B,0x1B,0x5B,0x75}
> -  gBlackBoxEfiVlanConfigProtocolGuid = { 0x9e23d768, 0xd2f3, 0x4366,
> 0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 }
> +  gBlackBoxEfiUnicodeCollationProtocolGuid = { 0x1d85cd7f, 0xf43d,
> 0x11d2, { 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
> +  gBlackBoxEfiUnicodeCollation2ProtocolGuid = { 0xa4c751fc, 0x23ae,
> 0x4c3e, { 0x92, 0xe9,  0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}
> +  gBlackBoxEfiUsb2HcProtocolGuid = { 0x3e745226, 0x9818, 0x45b6, {
> 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc }}
> +  gBlackBoxEfiUsbHcProtocolGuid = { 0xF5089266, 0x1AA0, 0x4953, {
> 0x97, 0xD8, 0x56, 0x2F, 0x8A, 0x73, 0xB5, 0x19 }}
> +  gBlackBoxEfiUsbIoProtocolGuid = { 0x2B2F68D6, 0x0CD2, 0x44cf, {
> 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }}
> +  gBlackBoxEfiVlanConfigProtocolGuid = { 0x9e23d768, 0xd2f3, 0x4366,
> { 0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 }}
>  
> -  gBlackBoxEfiHash2ServiceBindingProtocolGuid = { 0xda836f8d,
> 0x217f, 0x4ca0, 0x99, 0xc2, 0x1c, 0xa4, 0xe1, 0x60, 0x77, 0xea }
> -  gBlackBoxEfiHash2ProtocolGuid = { 0x55b1d734, 0xc5e1, 0x49db,
> 0x96, 0x47, 0xb1, 0x6a, 0xfb, 0xe, 0x30, 0x5b } 
> +  gBlackBoxEfiHash2ServiceBindingProtocolGuid = { 0xda836f8d,
> 0x217f, 0x4ca0, { 0x99, 0xc2, 0x1c, 0xa4, 0xe1, 0x60, 0x77, 0xea }}
> +  gBlackBoxEfiHash2ProtocolGuid = { 0x55b1d734, 0xc5e1, 0x49db, {
> 0x96, 0x47, 0xb1, 0x6a, 0xfb, 0xe, 0x30, 0x5b }}
>  
> -  gBlackBoxEfiPkcs7VerifyProtocolGuid = { 0x47889fb2, 0xd671,
> 0x4fab, 0xa0, 0xca, 0xdf, 0xe, 0x44, 0xdf, 0x70, 0xd6 }
> +  gBlackBoxEfiPkcs7VerifyProtocolGuid = { 0x47889fb2, 0xd671,
> 0x4fab, { 0xa0, 0xca, 0xdf, 0xe, 0x44, 0xdf, 0x70, 0xd6 }}
>    gBlackBoxEfiConfigKeywordHandlerProtocolGuid = { 0x0a8badd5,
> 0x03b8, 0x4d19, {0xb1, 0x28, 0x7b, 0x8f, 0x0e, 0xda, 0xa5, 0x96 }}
>    gBlackBoxEfiNVMEPassThruProtocolGuid = { 0x52c78312, 0x8edc,
> 0x4233, {0x98, 0xf2, 0x1a, 0x1a, 0xa5, 0xe3, 0x88, 0xa5 }}
>    gBlackBoxEfiRamDiskProtocolGuid = { 0xab38a0df, 0x6873, 0x44a9, {
> 0x87, 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }}
> -  gBlackBoxEfiEraseBlockProtocolGuid = { 0x95a9a93e, 0xa86e, 0x4926,
> {0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87}}
> +  gBlackBoxEfiEraseBlockProtocolGuid = { 0x95a9a93e, 0xa86e, 0x4926,
> { 0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87}}
>    gBlackBoxEfiSDMMCPassThruProtocolGuid = { 0x716ef0d9, 0xff83,
> 0x4f69, { 0x81, 0xe9, 0x51, 0x8b, 0xd3, 0x9a, 0x8e, 0x70 }}
>    gBlackBoxEfiPartitionInfoProtocolGuid = { 0x8cf2f62c, 0xbc9b,
> 0x4821, {0x80, 0x8d, 0xec, 0x9e, 0xc4, 0x21, 0xa1, 0xa0 }}
>    gBlackBoxEfiUFSDeviceConfigProtocolGuid = { 0xb81bfab0, 0xeb3,
> 0x4cf9, { 0x84, 0x65, 0x7f, 0xa9, 0x86, 0x36, 0x16, 0x64 }}
> -  gBlackBoxEfiResetNotificationProtocolGuid = { 0x9da34ae0, 0xeaf9,
> 0x4bbf, { 0x8e, 0xc3, 0xfd, 0x60, 0x22, 0x6c, 0x44, 0xbe } }
> \ No newline at end of file
> +  gBlackBoxEfiResetNotificationProtocolGuid = { 0x9da34ae0, 0xeaf9,
> 0x4bbf, { 0x8e, 0xc3, 0xfd, 0x60, 0x22, 0x6c, 0x44, 0xbe }}

[edk2-test][PATCH v2] SctPkg/build: Add support for GenBin tool build

[Lokesh B V]

As the GenBin tool is necessary for SCT build, it is appropriate to
support it's build in the SCT build procedure.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
Changes since v1:
* Addressed review comments from the mailing list
* modified Copyright content

 uefi-sct/SctPkg/build.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index 73581c9..a469362 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 - 2015, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2018, 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
@@ -228,21 +228,23 @@ else
   echo using prebuilt tools
 fi
 
-# Copy GenBin file to Base tools directory
+rm -f $EDK_TOOLS_PATH/Source/C/bin/GenBin
+
+# build the GenBin if it doesn't yet exist
+echo Building GenBin
+make -C $EDK_TOOLS_PATH/../SctPkg/Tools/Source/GenBin
+status=$?
+if test $status -ne 0
+then
+echo Error while building GenBin
+  exit -1
+fi
+
+# Copy GenBin file to Base tools bin directory
 DEST_DIR=`GetEdkToolsPathBinDirectory`
 # Ensure the directory exist
 mkdir -p $DEST_DIR
-case `uname -m` in 
-	x86_64)
-		cp SctPkg/Tools/Bin/GenBin_lin_64 $DEST_DIR/GenBin
-		;;
-	x86_32)
-		cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin
-		;;
-	*)
-		cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin
-		;;
-esac
+cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin
 
 #
 # Build the SCT package
-- 
2.7.4

Re: [edk2-test][PATCH v2] SctPkg/build: Add support for GenBin tool build

[Supreeth Venkatesh]

On Wed, 2018-11-28 at 15:00 +0530, Lokesh B V wrote:
> As the GenBin tool is necessary for SCT build, it is appropriate to
> support it's build in the SCT build procedure.
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

Pushed with additional changes specified below (inline).

> ---
> Changes since v1:
> * Addressed review comments from the mailing list
> * modified Copyright content
> 
>  uefi-sct/SctPkg/build.sh | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
> index 73581c9..a469362 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 - 2015, ARM Ltd. All rights reserved.<BR>
> +#  Copyright (c) 2011 - 2018, 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
> @@ -228,21 +228,23 @@ else
>    echo using prebuilt tools
>  fi
>  
> -# Copy GenBin file to Base tools directory
> +rm -f $EDK_TOOLS_PATH/Source/C/bin/GenBin
> +
> +# build the GenBin if it doesn't yet exist
> +echo Building GenBin
> +make -C $EDK_TOOLS_PATH/../SctPkg/Tools/Source/GenBin
make -C SctPkg/Tools/Source/GenBin is enough here.
 
> +status=$?
> +if test $status -ne 0
> +then
> +echo Error while building GenBin
> +  exit -1
> +fi
> +
> +# Copy GenBin file to Base tools bin directory
>  DEST_DIR=`GetEdkToolsPathBinDirectory`
>  # Ensure the directory exist
>  mkdir -p $DEST_DIR
> -case `uname -m` in 
> -	x86_64)
> -		cp SctPkg/Tools/Bin/GenBin_lin_64 $DEST_DIR/GenBin
> -		;;
> -	x86_32)
> -		cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin
> -		;;
> -	*)
> -		cp SctPkg/Tools/Bin/GenBin_lin_32 $DEST_DIR/GenBin
> -		;;
> -esac
> +cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin
>  
>  #
>  # Build the SCT package

[edk2-test][PATCH] Add *.o and *.d pattern to .gitignore

[Lokesh B V]

Ignore *.o and *.d untracked files.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 821ed66..3b8d818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Build/
 tags/
+*.[od]
-- 
2.7.4

Re: [edk2-test][PATCH] Add *.o and *.d pattern to .gitignore

[Supreeth Venkatesh]

On Wed, 2018-11-28 at 15:00 +0530, Lokesh B V wrote:
> Ignore *.o and *.d untracked files.
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

Pushed.

> ---
>  .gitignore | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.gitignore b/.gitignore
> index 821ed66..3b8d818 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,2 +1,3 @@
>  Build/
>  tags/
> +*.[od]

[edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Lokesh B V]

Some windows editors uses "\r\n" for line feed. While processing uefi
sct testcase info file, the GenBin tool logic to skip line feed doesn't
consider the presence of carraige return(\r) in line feed. So this results
in incorrect format error.

Fixed this issue by changing logic of Trim and Getline functions used
in GenBin source code.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
Changes since v1:
* Adopted changes suggested by Supreeth.
* modified Copyright content

 uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..6d8e844 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -2,6 +2,7 @@
 
   Copyright 2006 - 2010 Unified EFI, Inc.<BR>
   Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2018 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
@@ -32,6 +33,7 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 //
 // Definitions
@@ -49,7 +51,7 @@ PrintUsage (
   void
   );
 
-void
+char *
 Trim (
   char        *String
   );
@@ -159,50 +161,42 @@ PrintUsage (
 }
 
 
-void
+char *
 Trim (
   char        *String
   )
 {
-  int   Index1;
-  int   Index2;
   int   Length;
+  char  *end;
 
   Length = strlen (String);
 
-  //
-  // Remove the space characters from the beginning of this string
-  //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Index1] != ' ' ) &&
-        (String[Index1] != '\t') &&
-        (String[Index1] != '\n')) {
-      break;
-    }
-  }
-
-  for (Index2 = Index1; Index2 < Length; Index2++) {
-    String[Index2 - Index1] = String[Index2];
+  if (!Length) {
+    return String;
   }
 
-  Length = Length - Index1;
+  end = String + Length - 1;
 
   //
   // Remove the space characters from the end of this string
   //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Length - 1 - Index1] != ' ' ) &&
-        (String[Length - 1 - Index1] != '\t') &&
-        (String[Length - 1 - Index1] != '\n')) {
-      break;
-    }
+  while (end >= String && isspace (*end)) {
+    end--;
   }
 
-  String[Length - Index1] = '\0';
+  *(end + 1) = '\0';
+
+  //
+  // Remove the space characters from the beginning of this string
+  //
+  while (*String && isspace (*String)) {
+    String++;
+  }
 
   //
   // Done
   //
+  return String;
 }
 
 
@@ -227,20 +221,20 @@ GetLine (
       return -1;
     }
 
-    (*LineNo)++;
-
     //
     // Remove the beginning and ending space characters
     //
-    Trim (String);
+    String = Trim (Result);
 
     //
-    // Ignore the empty line and comment line
+    // Skip the empty line and comment line
     //
-    if ((String[0] != '\0') &&
-        (String[0] != '#' )) {
-      break;
+    if ((String[0] == '\0') ||
+        (String[0] == '#' )) {
+      continue;
     }
+
+    (*LineNo)++;
   }
 
   //
-- 
2.7.4

Re: [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Supreeth Venkatesh]

On Wed, 2018-11-28 at 15:00 +0530, Lokesh B V wrote:
> Some windows editors uses "\r\n" for line feed. While processing uefi
> sct testcase info file, the GenBin tool logic to skip line feed
> doesn't
> consider the presence of carraige return(\r) in line feed. So this 
Changed to "consider the presence of carriage return(\r)"

> results
> in incorrect format error.
> 
> Fixed this issue by changing logic of Trim and Getline functions used
> in GenBin source code.
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
Reviewed-by: Supreeth Venkatesh

Pushed with additional changes inline below.
> ---
> Changes since v1:
> * Adopted changes suggested by Supreeth.
> * modified Copyright content
> 
>  uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +++++++++++++-----
> ----------
>  1 file changed, 26 insertions(+), 32 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-
> sct/SctPkg/Tools/Source/GenBin/GenBin.c
> index 61bb35b..6d8e844 100644
> --- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
> +++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
> @@ -2,6 +2,7 @@
>  
>    Copyright 2006 - 2010 Unified EFI, Inc.<BR>
>    Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2018 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
> @@ -32,6 +33,7 @@ Abstract:
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <string.h>
> +#include <ctype.h>
>  
>  //
>  // Definitions
> @@ -49,7 +51,7 @@ PrintUsage (
>    void
>    );
>  
> -void
> +char *
>  Trim (
>    char        *String
>    );
> @@ -159,50 +161,42 @@ PrintUsage (
>  }
>  
>  
> -void
> +char *
>  Trim (
>    char        *String
>    )
>  {
> -  int   Index1;
> -  int   Index2;
>    int   Length;
> +  char  *end;
>  
>    Length = strlen (String);
>  
> -  //
> -  // Remove the space characters from the beginning of this string
> -  //
> -  for (Index1 = 0; Index1 < Length; Index1++) {
> -    if ((String[Index1] != ' ' ) &&
> -        (String[Index1] != '\t') &&
> -        (String[Index1] != '\n')) {
> -      break;
> -    }
> -  }
> -
> -  for (Index2 = Index1; Index2 < Length; Index2++) {
> -    String[Index2 - Index1] = String[Index2];
> +  if (!Length) {
> +    return String;
>    }
>  
> -  Length = Length - Index1;
> +  end = String + Length - 1;
>  
>    //
>    // Remove the space characters from the end of this string
>    //
> -  for (Index1 = 0; Index1 < Length; Index1++) {
> -    if ((String[Length - 1 - Index1] != ' ' ) &&
> -        (String[Length - 1 - Index1] != '\t') &&
> -        (String[Length - 1 - Index1] != '\n')) {
> -      break;
> -    }
> +  while (end >= String && isspace (*end)) {
> +    end--;
>    }
>  
> -  String[Length - Index1] = '\0';
> +  *(end + 1) = '\0';
> +
> +  //
> +  // Remove the space characters from the beginning of this string
> +  //
> +  while (*String && isspace (*String)) {
> +    String++;
> +  }
>  
>    //
>    // Done
>    //
> +  return String;
>  }
>  
>  
> @@ -227,20 +221,20 @@ GetLine (
>        return -1;
>      }
>  
> -    (*LineNo)++;
> -
>      //
>      // Remove the beginning and ending space characters
>      //
> -    Trim (String);
> +    String = Trim (Result);
>  
>      //
> -    // Ignore the empty line and comment line
> +    // Skip the empty line and comment line
>      //
> -    if ((String[0] != '\0') &&
> -        (String[0] != '#' )) {
> -      break;
> +    if ((String[0] == '\0') ||
> +        (String[0] == '#' )) {
> +      continue;
>      }
> +
> +    (*LineNo)++;
As LineNo is being used only for printing where the issue is, we should
increment line number as soon as fgets yields successful output.
Changed this and committed. 

>    }
>  
>    //

Re: [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Jin, Eric]

Hi Supreeth,

This patch can't be applied to the lasted code base SHA-1: 33022e. 
One patch from <Lokesh B V> may already fix the issue. Please check again.

Best Regards
Eric

-----Original Message-----
From: edk2-devel <edk2-devel-bounces@lists.01.org> On Behalf Of Supreeth Venkatesh
Sent: Friday, March 29, 2019 7:08 AM
To: supreeth.venkatesh@arm.com; edk2-devel@lists.01.org
Subject: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

From: Lokesh B V <lokesh.bv@arm.com>

Some windows editors uses "\r\n" for line feed. While processing uefi sct testcase info file, the GenBin tool logic to skip line feed doesn't consider the presence of carraige return(\r) in line feed. So this results in incorrect format error.

Fixed this issue by changing logic of Trim and Getline functions used in GenBin source code.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
Changes since v1:
* Adopted changes suggested by Supreeth.
* modified Copyright content

 uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..6d8e844 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -2,6 +2,7 @@
 
   Copyright 2006 - 2010 Unified EFI, Inc.<BR>
   Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2018 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 @@ -32,6 +33,7 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 //
 // Definitions
@@ -49,7 +51,7 @@ PrintUsage (
   void
   );
 
-void
+char *
 Trim (
   char        *String
   );
@@ -159,50 +161,42 @@ PrintUsage (
 }
 
 
-void
+char *
 Trim (
   char        *String
   )
 {
-  int   Index1;
-  int   Index2;
   int   Length;
+  char  *end;
 
   Length = strlen (String);
 
-  //
-  // Remove the space characters from the beginning of this string
-  //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Index1] != ' ' ) &&
-        (String[Index1] != '\t') &&
-        (String[Index1] != '\n')) {
-      break;
-    }
-  }
-
-  for (Index2 = Index1; Index2 < Length; Index2++) {
-    String[Index2 - Index1] = String[Index2];
+  if (!Length) {
+    return String;
   }
 
-  Length = Length - Index1;
+  end = String + Length - 1;
 
   //
   // Remove the space characters from the end of this string
   //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Length - 1 - Index1] != ' ' ) &&
-        (String[Length - 1 - Index1] != '\t') &&
-        (String[Length - 1 - Index1] != '\n')) {
-      break;
-    }
+  while (end >= String && isspace (*end)) {
+    end--;
   }
 
-  String[Length - Index1] = '\0';
+  *(end + 1) = '\0';
+
+  //
+  // Remove the space characters from the beginning of this string  //  
+ while (*String && isspace (*String)) {
+    String++;
+  }
 
   //
   // Done
   //
+  return String;
 }
 
 
@@ -227,20 +221,20 @@ GetLine (
       return -1;
     }
 
-    (*LineNo)++;
-
     //
     // Remove the beginning and ending space characters
     //
-    Trim (String);
+    String = Trim (Result);
 
     //
-    // Ignore the empty line and comment line
+    // Skip the empty line and comment line
     //
-    if ((String[0] != '\0') &&
-        (String[0] != '#' )) {
-      break;
+    if ((String[0] == '\0') ||
+        (String[0] == '#' )) {
+      continue;
     }
+
+    (*LineNo)++;
   }
 
   //
--
2.7.4


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Supreeth Venkatesh]

Sorry. This was sent in error. I was testing my new Desktop with git send-email.
Please ignore.

Supreeth


-----Original Message-----
From: Jin, Eric <eric.jin@intel.com>
Sent: Friday, March 29, 2019 3:32 AM
To: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; edk2-devel@lists.01.org
Cc: Jin, Eric <eric.jin@intel.com>
Subject: RE: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

Hi Supreeth,

This patch can't be applied to the lasted code base SHA-1: 33022e.
One patch from <Lokesh B V> may already fix the issue. Please check again.

Best Regards
Eric

-----Original Message-----
From: edk2-devel <edk2-devel-bounces@lists.01.org> On Behalf Of Supreeth Venkatesh
Sent: Friday, March 29, 2019 7:08 AM
To: supreeth.venkatesh@arm.com; edk2-devel@lists.01.org
Subject: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

From: Lokesh B V <lokesh.bv@arm.com>

Some windows editors uses "\r\n" for line feed. While processing uefi sct testcase info file, the GenBin tool logic to skip line feed doesn't consider the presence of carraige return(\r) in line feed. So this results in incorrect format error.

Fixed this issue by changing logic of Trim and Getline functions used in GenBin source code.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
Changes since v1:
* Adopted changes suggested by Supreeth.
* modified Copyright content

 uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..6d8e844 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -2,6 +2,7 @@

   Copyright 2006 - 2010 Unified EFI, Inc.<BR>
   Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2018 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 @@ -32,6 +33,7 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>

 //
 // Definitions
@@ -49,7 +51,7 @@ PrintUsage (
   void
   );

-void
+char *
 Trim (
   char        *String
   );
@@ -159,50 +161,42 @@ PrintUsage (
 }


-void
+char *
 Trim (
   char        *String
   )
 {
-  int   Index1;
-  int   Index2;
   int   Length;
+  char  *end;

   Length = strlen (String);

-  //
-  // Remove the space characters from the beginning of this string
-  //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Index1] != ' ' ) &&
-        (String[Index1] != '\t') &&
-        (String[Index1] != '\n')) {
-      break;
-    }
-  }
-
-  for (Index2 = Index1; Index2 < Length; Index2++) {
-    String[Index2 - Index1] = String[Index2];
+  if (!Length) {
+    return String;
   }

-  Length = Length - Index1;
+  end = String + Length - 1;

   //
   // Remove the space characters from the end of this string
   //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Length - 1 - Index1] != ' ' ) &&
-        (String[Length - 1 - Index1] != '\t') &&
-        (String[Length - 1 - Index1] != '\n')) {
-      break;
-    }
+  while (end >= String && isspace (*end)) {
+    end--;
   }

-  String[Length - Index1] = '\0';
+  *(end + 1) = '\0';
+
+  //
+  // Remove the space characters from the beginning of this string  //
+ while (*String && isspace (*String)) {
+    String++;
+  }

   //
   // Done
   //
+  return String;
 }


@@ -227,20 +221,20 @@ GetLine (
       return -1;
     }

-    (*LineNo)++;
-
     //
     // Remove the beginning and ending space characters
     //
-    Trim (String);
+    String = Trim (Result);

     //
-    // Ignore the empty line and comment line
+    // Skip the empty line and comment line
     //
-    if ((String[0] != '\0') &&
-        (String[0] != '#' )) {
-      break;
+    if ((String[0] == '\0') ||
+        (String[0] == '#' )) {
+      continue;
     }
+
+    (*LineNo)++;
   }

   //
--
2.7.4


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

Re: [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Minnow Ware]

Hi Supreeth,

theoretically the standard C implementation of fopen(char *filename, char *mode)
“can” support BINARY and TEXT mode. This is specified here http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf, “7.19.2 Streams”

In praxis only Windows-/DOS platforms supports a BINARY ( w/ “b”) and a TEXT mode (w/o “b”).
This is valid for all C-library implementations on that platforms.

In textmode all "\r\n"-sequences in the file are automatically (by the C Library) translated to “\n” only,
when reading the file to the buffer.
And on write operations each “\n” is transformed to “\r\n”.

On UNIX-systems with or without “b”-inary flag do not affect the data read/written.

Since the profile file is opened correctly in text mode (Line 107 https://github.com/tianocore/edk2-test/blob/master/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c),
the issue tells me, you are running on a UNIX system, dealing with Windows text files.

The GenBin.c should be extended by a manual BIN2TXT translation.

Best Regrads,
Kilian

https://github.com/MinnowWare


From: Jin, Eric<mailto:eric.jin@intel.com>
Sent: Friday, March 29, 2019 09:31 AM
To: Supreeth Venkatesh<mailto:supreeth.venkatesh@arm.com>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
Cc: Jin, Eric<mailto:eric.jin@intel.com>
Subject: Re: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

Hi Supreeth,

This patch can't be applied to the lasted code base SHA-1: 33022e.
One patch from <Lokesh B V> may already fix the issue. Please check again.

Best Regards
Eric

-----Original Message-----
From: edk2-devel <edk2-devel-bounces@lists.01.org> On Behalf Of Supreeth Venkatesh
Sent: Friday, March 29, 2019 7:08 AM
To: supreeth.venkatesh@arm.com; edk2-devel@lists.01.org
Subject: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

From: Lokesh B V <lokesh.bv@arm.com>

Some windows editors uses "\r\n" for line feed. While processing uefi sct testcase info file, the GenBin tool logic to skip line feed doesn't consider the presence of carraige return(\r) in line feed. So this results in incorrect format error.

Fixed this issue by changing logic of Trim and Getline functions used in GenBin source code.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
---
Changes since v1:
* Adopted changes suggested by Supreeth.
* modified Copyright content

 uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..6d8e844 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -2,6 +2,7 @@

   Copyright 2006 - 2010 Unified EFI, Inc.<BR>
   Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2018 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 @@ -32,6 +33,7 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>

 //
 // Definitions
@@ -49,7 +51,7 @@ PrintUsage (
   void
   );

-void
+char *
 Trim (
   char        *String
   );
@@ -159,50 +161,42 @@ PrintUsage (
 }


-void
+char *
 Trim (
   char        *String
   )
 {
-  int   Index1;
-  int   Index2;
   int   Length;
+  char  *end;

   Length = strlen (String);

-  //
-  // Remove the space characters from the beginning of this string
-  //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Index1] != ' ' ) &&
-        (String[Index1] != '\t') &&
-        (String[Index1] != '\n')) {
-      break;
-    }
-  }
-
-  for (Index2 = Index1; Index2 < Length; Index2++) {
-    String[Index2 - Index1] = String[Index2];
+  if (!Length) {
+    return String;
   }

-  Length = Length - Index1;
+  end = String + Length - 1;

   //
   // Remove the space characters from the end of this string
   //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Length - 1 - Index1] != ' ' ) &&
-        (String[Length - 1 - Index1] != '\t') &&
-        (String[Length - 1 - Index1] != '\n')) {
-      break;
-    }
+  while (end >= String && isspace (*end)) {
+    end--;
   }

-  String[Length - Index1] = '\0';
+  *(end + 1) = '\0';
+
+  //
+  // Remove the space characters from the beginning of this string  //
+ while (*String && isspace (*String)) {
+    String++;
+  }

   //
   // Done
   //
+  return String;
 }


@@ -227,20 +221,20 @@ GetLine (
       return -1;
     }

-    (*LineNo)++;
-
     //
     // Remove the beginning and ending space characters
     //
-    Trim (String);
+    String = Trim (Result);

     //
-    // Ignore the empty line and comment line
+    // Skip the empty line and comment line
     //
-    if ((String[0] != '\0') &&
-        (String[0] != '#' )) {
-      break;
+    if ((String[0] == '\0') ||
+        (String[0] == '#' )) {
+      continue;
     }
+
+    (*LineNo)++;
   }

   //
--
2.7.4


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Supreeth Venkatesh]

Thanks Kilian.
There was no issue. This patch was sent in error.
However, I will look into this feedback - "The GenBin.c should be extended by a manual BIN2TXT translation."

Supreeth


From: Minnow Ware <minnowware@outlook.com>
Sent: Friday, March 29, 2019 9:29 AM
To: Jin, Eric <eric.jin@intel.com>; Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>; edk2-devel@lists.01.org
Cc: Jin, Eric <eric.jin@intel.com>
Subject: RE: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

Hi Supreeth,

theoretically the standard C implementation of fopen(char *filename, char *mode)
"can" support BINARY and TEXT mode. This is specified here http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf, "7.19.2 Streams"

In praxis only Windows-/DOS platforms supports a BINARY ( w/ "b") and a TEXT mode (w/o "b").
This is valid for all C-library implementations on that platforms.

In textmode all "\r\n"-sequences in the file are automatically (by the C Library) translated to "\n" only,
when reading the file to the buffer.
And on write operations each "\n" is transformed to "\r\n".

On UNIX-systems with or without "b"-inary flag do not affect the data read/written.

Since the profile file is opened correctly in text mode (Line 107 https://github.com/tianocore/edk2-test/blob/master/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c),
the issue tells me, you are running on a UNIX system, dealing with Windows text files.

The GenBin.c should be extended by a manual BIN2TXT translation.

Best Regrads,
Kilian

https://github.com/MinnowWare


From: Jin, Eric<mailto:eric.jin@intel.com>
Sent: Friday, March 29, 2019 09:31 AM
To: Supreeth Venkatesh<mailto:supreeth.venkatesh@arm.com>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
Cc: Jin, Eric<mailto:eric.jin@intel.com>
Subject: Re: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

Hi Supreeth,

This patch can't be applied to the lasted code base SHA-1: 33022e.
One patch from <Lokesh B V> may already fix the issue. Please check again.

Best Regards
Eric

-----Original Message-----
From: edk2-devel <edk2-devel-bounces@lists.01.org<mailto:edk2-devel-bounces@lists.01.org>> On Behalf Of Supreeth Venkatesh
Sent: Friday, March 29, 2019 7:08 AM
To: supreeth.venkatesh@arm.com<mailto:supreeth.venkatesh@arm.com>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
Subject: [edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

From: Lokesh B V <lokesh.bv@arm.com<mailto:lokesh.bv@arm.com>>

Some windows editors uses "\r\n" for line feed. While processing uefi sct testcase info file, the GenBin tool logic to skip line feed doesn't consider the presence of carraige return(\r) in line feed. So this results in incorrect format error.

Fixed this issue by changing logic of Trim and Getline functions used in GenBin source code.

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com<mailto:supreeth.venkatesh@arm.com>>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V <lokesh.bv@arm.com<mailto:lokesh.bv@arm.com>>
---
Changes since v1:
* Adopted changes suggested by Supreeth.
* modified Copyright content

 uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..6d8e844 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -2,6 +2,7 @@

   Copyright 2006 - 2010 Unified EFI, Inc.<BR>
   Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2018 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 @@ -32,6 +33,7 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>

 //
 // Definitions
@@ -49,7 +51,7 @@ PrintUsage (
   void
   );

-void
+char *
 Trim (
   char        *String
   );
@@ -159,50 +161,42 @@ PrintUsage (
 }


-void
+char *
 Trim (
   char        *String
   )
 {
-  int   Index1;
-  int   Index2;
   int   Length;
+  char  *end;

   Length = strlen (String);

-  //
-  // Remove the space characters from the beginning of this string
-  //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Index1] != ' ' ) &&
-        (String[Index1] != '\t') &&
-        (String[Index1] != '\n')) {
-      break;
-    }
-  }
-
-  for (Index2 = Index1; Index2 < Length; Index2++) {
-    String[Index2 - Index1] = String[Index2];
+  if (!Length) {
+    return String;
   }

-  Length = Length - Index1;
+  end = String + Length - 1;

   //
   // Remove the space characters from the end of this string
   //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-    if ((String[Length - 1 - Index1] != ' ' ) &&
-        (String[Length - 1 - Index1] != '\t') &&
-        (String[Length - 1 - Index1] != '\n')) {
-      break;
-    }
+  while (end >= String && isspace (*end)) {
+    end--;
   }

-  String[Length - Index1] = '\0';
+  *(end + 1) = '\0';
+
+  //
+  // Remove the space characters from the beginning of this string  //
+ while (*String && isspace (*String)) {
+    String++;
+  }

   //
   // Done
   //
+  return String;
 }


@@ -227,20 +221,20 @@ GetLine (
       return -1;
     }

-    (*LineNo)++;
-
     //
     // Remove the beginning and ending space characters
     //
-    Trim (String);
+    String = Trim (Result);

     //
-    // Ignore the empty line and comment line
+    // Skip the empty line and comment line
     //
-    if ((String[0] != '\0') &&
-        (String[0] != '#' )) {
-      break;
+    if ((String[0] == '\0') ||
+        (String[0] == '#' )) {
+      continue;
     }
+
+    (*LineNo)++;
   }

   //
--
2.7.4


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
https://lists.01.org/mailman/listinfo/edk2-devel

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.

Re: [edk2-test][PATCH] Framework/Include: allow usage with EFI version 2.7

[Supreeth Venkatesh]

Thanks for the patch.

Pushed with the following changes
copyright text by adding a comma as below:
Copyright (c) 2018, ARM Ltd. All rights reserved.<BR>
On Wed, 2018-11-28 at 14:59 +0530, Lokesh B V wrote:

Thanks,
Supreeth
> EDK2 supports EFI version 2.7 and so allow UEFI-SCT to be
> usable with this version of EFI.
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Lokesh B V <lokesh.bv@arm.com>
> ---
>  uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h |
> 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/uefi-
> sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h b/uefi-
> sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h
> index d24c201..8fda374 100644
> --- a/uefi-
> sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h
> +++ b/uefi-
> sct/SctPkg/TestInfrastructure/SCT/Framework/Include/SctDef.h
> @@ -2,6 +2,7 @@
>  
>    Copyright 2006 - 2017 Unified EFI, Inc.<BR>
>    Copyright (c) 2010 - 2017, Intel Corporation. All rights
> reserved.<BR>
> +  Copyright (c) 2018 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
> @@ -46,6 +47,8 @@ Abstract:
>  #define EFI_SCT_NAME                        L"UEFI2.5 Self
> Certification Test(SCT2)"
>  #elif (EFI_SPECIFICATION_VERSION == EFI_2_60_SYSTEM_TABLE_REVISION)
>  #define EFI_SCT_NAME                        L"UEFI2.6 Self
> Certification Test(SCT2)"
> +#elif (EFI_SPECIFICATION_VERSION == EFI_2_70_SYSTEM_TABLE_REVISION)
> +#define EFI_SCT_NAME                        L"UEFI2.7 Self
> Certification Test(SCT2)"
>  #else
>  #error Unknown EFI_SPECIFICATION_VERSION
>  #endif