Remove Framework HII "class\subclass" in all VFR

class/subclass is the obseleted key word in VFR file. It is designed in framework HII.
After convert to UEFI HII, it is not used any longer. Now remove them from VFR

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17493 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index 48cc33c3f6d1996af3ccafb2c4039dc436acd03c..0d35c2c37e68fdb656d1bbc87fc09b8639eb3644 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -20,8 +20,6 @@ formset
   title = STRING_TOKEN(STR_FORM_MAIN_TITLE),\r
   help = STRING_TOKEN(STR_NULL_STRING),\r
   classguid = BOOT_MAINT_FORMSET_GUID,\r
-  class = 0,\r
-  subclass = 0,\r
 \r
   varstore BMM_FAKE_NV_DATA,\r
     varid = VARSTORE_ID_BOOT_MAINT,\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
index 1531617dc5ed66c0af3edfad56647caa602b52ba..056694ebef7ac594ed8c8dee3bf5a5b40f511327 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
@@ -20,8 +20,6 @@ formset
   title = STRING_TOKEN(STR_FILE_EXPLORER_TITLE),\r
   help = STRING_TOKEN(STR_NULL_STRING),\r
   classguid = FILE_EXPLORE_FORMSET_GUID,\r
-  class = 0,\r
-  subclass = 0,\r
 \r
   varstore FILE_EXPLORER_NV_DATA,\r
     varid = VARSTORE_ID_BOOT_MAINT,\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
index 293e4e78320d1c4f4e126011fbedcd9c9c0355e8..0d8142c17da0352711eeee019adcc3fd05b01d1f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
@@ -28,8 +28,6 @@ formset
   title     = STRING_TOKEN(STR_BM_BANNER),\r
   help      = STRING_TOKEN(STR_LAST_STRING),\r
   classguid = BOOT_MANAGER_FORMSET_GUID,\r
-  class     = BOOT_MANAGER_CLASS,\r
-  subclass  = BOOT_MANAGER_SUBCLASS,\r
 \r
   form formid = BOOT_MANAGER_FORM_ID,\r
        title  = STRING_TOKEN(STR_BM_BANNER);\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
index 4d7d43b7d14e6d87f5e5b4c51a7d56419414a791..0ad671bdcab0470ccf7c054af1af3f5910d6bcbe 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
@@ -30,8 +30,6 @@ formset
   title     = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE),\r
   help      = STRING_TOKEN(STR_EMPTY_STRING),\r
   classguid = DEVICE_MANAGER_FORMSET_GUID,\r
-  class     = DEVICE_MANAGER_CLASS,\r
-  subclass  = FRONT_PAGE_SUBCLASS,\r
 \r
   form formid = DEVICE_MANAGER_FORM_ID,\r
        title  = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE);\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index d5fe4f4c480e4880ff713b3fab20f19f4cf08f68..43e21ec516b02e226407b179b431f4003d2b2506 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -41,8 +41,6 @@ formset
   title    = STRING_TOKEN(STR_FRONT_PAGE_TITLE),\r
   help     = STRING_TOKEN(STR_NULL_STRING),\r
   classguid = FRONT_PAGE_FORMSET_GUID,\r
-  class    = FRONT_PAGE_CLASS,\r
-  subclass = FRONT_PAGE_SUBCLASS,\r
 \r
   form formid = FRONT_PAGE_FORM_ID,\r
        title  = STRING_TOKEN(STR_FRONT_PAGE_TITLE);\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
index b5b93d4c86fdf5d4650865231c732b141452c121..daa2577383c18b1c77d652f414d0f59a17dbf542 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
@@ -19,8 +19,6 @@ formset
   guid     = DRIVER_SAMPLE_INVENTORY_GUID,\r
   title    = STRING_TOKEN(STR_INV_FORM_SET_TITLE),\r
   help     = STRING_TOKEN(STR_INV_FORM_SET_HELP),\r
-  class    = 0x04,\r
-  subclass = 0x03,\r
 \r
   form formid = 1,\r
        title  = STRING_TOKEN(STR_INV_FORM1_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 018fe059880988440acf50f37fe7702bea1c1179..2456c51c8c33a05ad9dd9286883290a858499779 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -20,8 +20,6 @@ formset
   guid     = IP4_ISCSI_CONFIG_GUID,\r
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),\r
-  class    = EFI_NETWORK_DEVICE_CLASS,\r
-  subclass = 0x03,\r
 \r
   varstore ISCSI_CONFIG_IFR_NVDATA,\r
     name = ISCSI_CONFIG_IFR_NVDATA,\r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
index 661f6262c97dbd15ce67d249ccd13a1d9d04ab2c..bd3e36ad06a11cbc016d8bbb3499db3296c46013 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
@@ -19,8 +19,6 @@ formset
   guid     = EFI_NIC_IP4_CONFIG_NVDATA_GUID,\r
   title    = STRING_TOKEN(STR_IP4_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_IP4_CONFIG_FORM_HELP),\r
-  class    = EFI_NETWORK_DEVICE_CLASS,\r
-  subclass = 0x03,\r
 \r
   varstore IP4_CONFIG_IFR_NVDATA,\r
     name = EfiNicIp4ConfigVariable,\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
index eb0e3dec557840c13454afbbfa3288614f34f3be..52240a1f77f9f4941cea5786b0b3446bdf9b53b3 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
@@ -28,8 +28,6 @@ formset
   guid     = PLAT_OVER_MNGR_GUID,\r
   title    = STRING_TOKEN(STR_ENTRY_TITLE),\r
   help     = STRING_TOKEN(STR_TITLE_HELP),\r
-  class    = EFI_DISK_DEVICE_CLASS,\r
-  subclass = 0xff,\r
 \r
   varstore PLAT_OVER_MNGR_DATA,\r
     varid = VARSTORE_ID_PLAT_OVER_MNGR,\r

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 80e833f10f0d63fbe4bbb5ac1b51b2a569da5625..db77c0f2156158fc37d853a889d77fe470128d6b 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -20,8 +20,6 @@ formset
   guid     = ISCSI_CONFIG_GUID,\r
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),\r
-  class    = EFI_NETWORK_DEVICE_CLASS,\r
-  subclass = 0x03,\r
 \r
   varstore ISCSI_CONFIG_IFR_NVDATA,\r
     varid = CONFIGURATION_VARSTORE_ID,\r

diff --git a/NetworkPkg/Ip6Dxe/Ip6Config.vfr b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
index 0d62b0a16808139f5225d05a18b64f7914b70446..67fd386bcac2f4236b810d77f64d2c9b7a268302 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Config.vfr
+++ b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
@@ -21,8 +21,6 @@ formset
   guid     = IP6_CONFIG_NVDATA_GUID,\r
   title    = STRING_TOKEN(STR_IP6_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_IP6_CONFIG_FORM_HELP),\r
-  class    = EFI_NETWORK_DEVICE_CLASS,\r
-  subclass = 0x03,\r
 \r
   varstore IP6_CONFIG_IFR_NVDATA,\r
     name = IP6_CONFIG_IFR_NVDATA,\r

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
index 59fb348651dbd81badc42a4b111db622f76f3205..2cf3359f2af8f4dd2e2c4239adb9bb1fc2da4e43 100644 (file)
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
@@ -21,8 +21,6 @@ formset
   guid     = USER_PROFILE_MANAGER_GUID,\r
   title    = STRING_TOKEN(STR_FORMSET_TITLE),  \r
   help     = STRING_TOKEN(STR_TITLE_HELP),\r
-  class    = USER_MANAGER_CLASS,\r
-  subclass = USER_MANAGER_SUBCLASS,\r
     \r
   // User manager form\r
   form formid = FORMID_USER_MANAGE,\r

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr b/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
index 6922ce2c3f4ba956959806c548cb5eabce222aa9..e5200331913817fc138347633007659ab4e2895a 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
@@ -21,8 +21,6 @@ formset
   guid     = SYSTEM_CONFIGURATION_GUID,\r
   title    = STRING_TOKEN(STR_SYSTEM_SETUP_TITLE),\r
   help     = STRING_TOKEN(STR_SYSTEM_SETUP_HELP),\r
-  class    = 1,\r
-  subclass = 0,\r
 \r
 \r
   varstore SYSTEM_CONFIGURATION, name = Setup, guid = SYSTEM_CONFIGURATION_GUID;\r