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

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

diff --git a/src/include/ipxe/efi/efi_hii.h b/src/include/ipxe/efi/efi_hii.h
index 1a98750f2cf317d0be0bcc83e5cb088029f84eb7..f95a75f609c3d861c9680b9349a7860a0d64cb81 100644 (file)
--- a/src/include/ipxe/efi/efi_hii.h
+++ b/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 */

diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c
index b4ae5113d82e4bfb20faa9d341cba84a620c3400..48645dc0c1de748d3ac0b66365a70f6c2d151d1e 100644 (file)
--- a/src/interface/efi/efi_snp.c
+++ b/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 ),