[efi] Mark SNP formset compliant with IBM's Unified Configuration Manager

Signed-off-by: Michael Brown <mcb30@ipxe.org>

src/include/ipxe/efi/efi_hii.h

@@ -137,4 +137,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	},								   \
 	}
 
+/** GUID indicating formset compliance for IBM Unified Configuration Manager */
+#define EFI_HII_IBM_UCM_COMPLIANT_FORMSET_GUID				   \
+	{ 0x5c8e9746, 0xa5f7, 0x4593,					   \
+	  { 0xaf, 0x1f, 0x66, 0xa8, 0x2a, 0xa1, 0x9c, 0xb1 } }
+
 #endif /* _IPXE_EFI_HII_H */

src/interface/efi/efi_snp.c

@@ -805,7 +805,7 @@ enum efi_snp_hii_string_id {
 /** EFI SNP formset */
 struct efi_snp_formset {
 	EFI_HII_PACKAGE_HEADER Header;
-	EFI_IFR_FORM_SET_TYPE(1) FormSet;
+	EFI_IFR_FORM_SET_TYPE(2) FormSet;
 	EFI_IFR_GUID_CLASS Class;
 	EFI_IFR_GUID_SUBCLASS SubClass;
 	EFI_IFR_FORM Form;
@@ -824,7 +824,8 @@ struct efi_snp_formset {
 				      EFI_SNP_FORMSET_TITLE,
 				      EFI_SNP_FORMSET_HELP,
 				      typeof ( efi_snp_formset.FormSet ),
-				      EFI_HII_PLATFORM_SETUP_FORMSET_GUID ),
+				      EFI_HII_PLATFORM_SETUP_FORMSET_GUID,
+				      EFI_HII_IBM_UCM_COMPLIANT_FORMSET_GUID ),
 	.Class = EFI_IFR_GUID_CLASS ( EFI_NETWORK_DEVICE_CLASS ),
 	.SubClass = EFI_IFR_GUID_SUBCLASS ( 0x03 ),
 	.Form = EFI_IFR_FORM ( EFI_SNP_FORM, EFI_SNP_FORMSET_TITLE ),