diff --git a/misc/config_tools/data/adl-rvp/industry.xml b/misc/config_tools/data/adl-rvp/industry.xml
index 62c50f195..f77286623 100755
--- a/misc/config_tools/data/adl-rvp/industry.xml
+++ b/misc/config_tools/data/adl-rvp/industry.xml
@@ -125,7 +125,6 @@
0
0
-
VUART_LEGACY_PIO
COM1_BASE
@@ -146,6 +145,7 @@
1
1
+ n
POST_RT_VM
@@ -184,6 +184,7 @@
1
1
+ n
POST_STD_VM
@@ -230,6 +231,7 @@
1
1
+ n
POST_STD_VM
@@ -276,6 +278,7 @@
1
1
+ n
POST_STD_VM
@@ -322,6 +325,7 @@
1
1
+ n
POST_STD_VM
@@ -368,6 +372,7 @@
1
1
+ n
KATA_VM
@@ -411,6 +416,7 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-mrb/hybrid.xml b/misc/config_tools/data/apl-mrb/hybrid.xml
index 44593ce0d..08f5a9c0c 100644
--- a/misc/config_tools/data/apl-mrb/hybrid.xml
+++ b/misc/config_tools/data/apl-mrb/hybrid.xml
@@ -212,5 +212,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-mrb/industry.xml b/misc/config_tools/data/apl-mrb/industry.xml
index 0838320fb..d4b0665fd 100644
--- a/misc/config_tools/data/apl-mrb/industry.xml
+++ b/misc/config_tools/data/apl-mrb/industry.xml
@@ -186,5 +186,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-mrb/sdc.xml b/misc/config_tools/data/apl-mrb/sdc.xml
index 48e3bdf8a..1793d80ea 100644
--- a/misc/config_tools/data/apl-mrb/sdc.xml
+++ b/misc/config_tools/data/apl-mrb/sdc.xml
@@ -149,6 +149,7 @@
1
1
+ n
KATA_VM
@@ -182,5 +183,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aaag.xml b/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aaag.xml
index 23ff944ab..79874f258 100644
--- a/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aaag.xml
+++ b/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aaag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
IOC
+ n
diff --git a/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aliaag.xml b/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aliaag.xml
index 6b912f19e..cfa42668e 100644
--- a/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aliaag.xml
+++ b/misc/config_tools/data/apl-mrb/sdc_launch_1uos_aliaag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
IOC
+ n
diff --git a/misc/config_tools/data/apl-mrb/sdc_launch_1uos_laag.xml b/misc/config_tools/data/apl-mrb/sdc_launch_1uos_laag.xml
index b8e76b049..4b94fa4f6 100644
--- a/misc/config_tools/data/apl-mrb/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/apl-mrb/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
IOC
+ n
diff --git a/misc/config_tools/data/apl-up2-n3350/sdc_launch_1uos_laag.xml b/misc/config_tools/data/apl-up2-n3350/sdc_launch_1uos_laag.xml
index c1b2b73a3..5b7ff037f 100644
--- a/misc/config_tools/data/apl-up2-n3350/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/apl-up2-n3350/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
PowerButton
+ n
diff --git a/misc/config_tools/data/apl-up2/hybrid.xml b/misc/config_tools/data/apl-up2/hybrid.xml
index d275d254b..e43a3b2d8 100644
--- a/misc/config_tools/data/apl-up2/hybrid.xml
+++ b/misc/config_tools/data/apl-up2/hybrid.xml
@@ -212,5 +212,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-up2/industry.xml b/misc/config_tools/data/apl-up2/industry.xml
index 04b26dd83..0034af12e 100644
--- a/misc/config_tools/data/apl-up2/industry.xml
+++ b/misc/config_tools/data/apl-up2/industry.xml
@@ -148,6 +148,7 @@
1
1
+ n
POST_RT_VM
@@ -186,5 +187,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-up2/sdc.xml b/misc/config_tools/data/apl-up2/sdc.xml
index 1dc194740..b49a3f395 100644
--- a/misc/config_tools/data/apl-up2/sdc.xml
+++ b/misc/config_tools/data/apl-up2/sdc.xml
@@ -149,6 +149,7 @@
1
1
+ n
KATA_VM
@@ -182,5 +183,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/apl-up2/sdc_launch_1uos_aaag.xml b/misc/config_tools/data/apl-up2/sdc_launch_1uos_aaag.xml
index be95ec885..a6c37d5a2 100644
--- a/misc/config_tools/data/apl-up2/sdc_launch_1uos_aaag.xml
+++ b/misc/config_tools/data/apl-up2/sdc_launch_1uos_aaag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
PowerButton
+ n
diff --git a/misc/config_tools/data/apl-up2/sdc_launch_1uos_laag.xml b/misc/config_tools/data/apl-up2/sdc_launch_1uos_laag.xml
index f6805ad05..968324af7 100644
--- a/misc/config_tools/data/apl-up2/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/apl-up2/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
PowerButton
+ n
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index f0be8ec09..a4684e6f7 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -222,6 +222,7 @@
1
1
+ n
POST_STD_VM
@@ -260,5 +261,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/cfl-k700-i7/industry.xml b/misc/config_tools/data/cfl-k700-i7/industry.xml
index b88d9afeb..1fa3668ba 100644
--- a/misc/config_tools/data/cfl-k700-i7/industry.xml
+++ b/misc/config_tools/data/cfl-k700-i7/industry.xml
@@ -183,6 +183,7 @@
1
1
+ n
POST_STD_VM
@@ -221,6 +222,7 @@
1
1
+ n
POST_STD_VM
@@ -259,6 +261,7 @@
1
1
+ n
POST_STD_VM
@@ -297,6 +300,7 @@
1
1
+ n
POST_STD_VM
@@ -335,6 +339,7 @@
1
1
+ n
KATA_VM
@@ -370,5 +375,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index 62f43fb56..f65eba8c7 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -220,5 +220,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index 25d158c30..70adac06e 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -223,6 +223,7 @@
0
1
+ n
POST_STD_VM
@@ -259,5 +260,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index c8216c404..416ecafc9 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -221,5 +221,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
index d4e4f749d..d2fc95b26 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml
index 796592677..e511c7f66 100644
--- a/misc/config_tools/data/ehl-crb-b/industry.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry.xml
@@ -196,6 +196,7 @@
1
1
+ n
POST_STD_VM
@@ -234,6 +235,7 @@
1
1
+ n
POST_STD_VM
@@ -272,6 +274,7 @@
1
1
+ n
POST_STD_VM
@@ -310,6 +313,7 @@
1
1
+ n
POST_STD_VM
@@ -348,6 +352,7 @@
1
1
+ n
KATA_VM
@@ -383,5 +388,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_hardrt.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_hardrt.xml
index e0c67ad76..5b251af9c 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_hardrt.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_vxworks.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_vxworks.xml
index ab8f076a1..d0e5f0c22 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_vxworks.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_vxworks.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml
index e5416ff52..dd2cf913c 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml
index 51e20afb8..9b1a9c768 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml
index 8cf1be0f8..77bf2c4e5 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
@@ -90,6 +92,7 @@
ovmf
Disable
+ n
@@ -130,6 +133,7 @@
ovmf
Disable
+ n
@@ -170,6 +174,7 @@
ovmf
Disable
+ n
@@ -210,6 +215,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml
index 40f5b3847..9c1d7854f 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc.xml
@@ -185,5 +185,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_laag.xml b/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_laag.xml
index 7fe39bbc4..572889aa3 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml
index d26114518..d5bcaea3f 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 81851783d..71aeab96a 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -221,5 +221,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index a06da9cd8..a970c9cc1 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -221,6 +221,7 @@
0
1
+ n
POST_STD_VM
@@ -257,5 +258,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml
index bb7d92775..bdd786ba6 100644
--- a/misc/config_tools/data/generic_board/industry.xml
+++ b/misc/config_tools/data/generic_board/industry.xml
@@ -156,6 +156,7 @@
1
1
+ n
POST_RT_VM
@@ -194,6 +195,7 @@
1
1
+ n
POST_STD_VM
@@ -232,6 +234,7 @@
1
1
+ n
POST_STD_VM
@@ -270,6 +273,7 @@
1
1
+ n
POST_STD_VM
@@ -308,6 +312,7 @@
1
1
+ n
POST_STD_VM
@@ -346,6 +351,7 @@
1
1
+ n
KATA_VM
@@ -381,5 +387,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/generic_board/industry_launch_2uos.xml b/misc/config_tools/data/generic_board/industry_launch_2uos.xml
index ce1869fbc..5f2086e12 100644
--- a/misc/config_tools/data/generic_board/industry_launch_2uos.xml
+++ b/misc/config_tools/data/generic_board/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/hybrid.xml b/misc/config_tools/data/nuc6cayh/hybrid.xml
index 6d06905e5..65ca4279a 100644
--- a/misc/config_tools/data/nuc6cayh/hybrid.xml
+++ b/misc/config_tools/data/nuc6cayh/hybrid.xml
@@ -210,5 +210,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/nuc6cayh/industry.xml b/misc/config_tools/data/nuc6cayh/industry.xml
index cf81a2a24..986ee9248 100644
--- a/misc/config_tools/data/nuc6cayh/industry.xml
+++ b/misc/config_tools/data/nuc6cayh/industry.xml
@@ -147,6 +147,7 @@
1
1
+ n
POST_RT_VM
@@ -185,6 +186,7 @@
1
1
+ n
POST_STD_VM
@@ -223,6 +225,7 @@
1
1
+ n
POST_STD_VM
@@ -261,6 +264,7 @@
1
1
+ n
POST_STD_VM
@@ -299,6 +303,7 @@
1
1
+ n
POST_STD_VM
@@ -337,6 +342,7 @@
1
1
+ n
KATA_VM
@@ -372,5 +378,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_hardrt.xml b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_hardrt.xml
index 23363e5ea..f9bc8615f 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_hardrt.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_vxworks.xml b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_vxworks.xml
index 48337a387..9d72652c9 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_vxworks.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_vxworks.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_waag.xml b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_waag.xml
index df60af222..8e65ee5db 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml b/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml
index 7add37070..1874477ab 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -50,6 +51,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml b/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml
index 97c65018d..736bdcd63 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -50,6 +51,7 @@
ovmf
Disable
+ n
@@ -92,6 +94,7 @@
ovmf
Disable
+ n
@@ -132,6 +135,7 @@
ovmf
Disable
+ n
@@ -172,6 +176,7 @@
ovmf
Disable
+ n
@@ -212,6 +217,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/sdc.xml b/misc/config_tools/data/nuc6cayh/sdc.xml
index fcb54a253..733207cc1 100644
--- a/misc/config_tools/data/nuc6cayh/sdc.xml
+++ b/misc/config_tools/data/nuc6cayh/sdc.xml
@@ -148,6 +148,7 @@
1
1
+ n
KATA_VM
@@ -181,5 +182,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_laag.xml b/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_laag.xml
index 61ed641c1..c7df1068c 100644
--- a/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_zephyr.xml
index b5e7ea9ff..ccad78e7f 100644
--- a/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_zephyr.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index b4160a429..4a5ec2bbc 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -206,5 +206,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml
index 5602e580b..aa6a83a21 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/industry.xml b/misc/config_tools/data/nuc7i7dnb/industry.xml
index ed39d218e..0ac89385a 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry.xml
@@ -182,6 +182,7 @@
1
1
+ n
POST_STD_VM
@@ -220,6 +221,7 @@
1
1
+ n
POST_STD_VM
@@ -258,6 +260,7 @@
1
1
+ n
POST_STD_VM
@@ -296,6 +299,7 @@
1
1
+ n
POST_STD_VM
@@ -334,6 +338,7 @@
1
1
+ n
KATA_VM
@@ -369,5 +374,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml
index 90d962518..65b9c7d17 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_vxworks.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_vxworks.xml
index f44b885e2..1ea2667e4 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_vxworks.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_vxworks.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_waag.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_waag.xml
index 1cfd453f7..abda8cb0f 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml
index af0eb710d..7daf22708 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml
index 708cee4b2..1ca6d24c2 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
@@ -90,6 +92,7 @@
ovmf
Disable
+ n
@@ -130,6 +133,7 @@
ovmf
Disable
+ n
@@ -170,6 +174,7 @@
ovmf
Disable
+ n
@@ -210,6 +215,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc.xml b/misc/config_tools/data/nuc7i7dnb/sdc.xml
index 53e1d149f..6ab63c630 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc.xml
@@ -143,6 +143,7 @@
1
1
+ n
KATA_VM
@@ -176,5 +177,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_laag.xml b/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_laag.xml
index b1a478262..ebad1621a 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_zephyr.xml
index a769e3578..27ea4c733 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_zephyr.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index 0faa5cd13..f5d9570f8 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -205,5 +205,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index 945c17a5d..8c8fdebbb 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -214,6 +214,7 @@
1
1
+ n
POST_STD_VM
@@ -250,5 +251,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
index 24f265070..a99f8073e 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index 112c63e2c..c5dccc9dd 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -139,6 +139,7 @@
1
1
+ n
POST_RT_VM
@@ -177,6 +178,7 @@
1
1
+ n
POST_STD_VM
@@ -215,6 +217,7 @@
1
1
+ n
POST_STD_VM
@@ -253,6 +256,7 @@
1
1
+ n
POST_STD_VM
@@ -291,6 +295,7 @@
1
1
+ n
POST_STD_VM
@@ -329,6 +334,7 @@
1
1
+ n
KATA_VM
@@ -364,5 +370,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml b/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml
index d0c64efcb..5b86d2ec1 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml b/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
index 5dbb708c2..9a4860a57 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml b/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
index 2cc0fe159..333287e97 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
@@ -90,6 +92,7 @@
ovmf
Disable
+ n
@@ -130,6 +133,7 @@
ovmf
Disable
+ n
@@ -170,6 +174,7 @@
ovmf
Disable
+ n
@@ -210,6 +215,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/tgl-rvp/sdc.xml b/misc/config_tools/data/tgl-rvp/sdc.xml
index 799ea2342..4a292b8d1 100644
--- a/misc/config_tools/data/tgl-rvp/sdc.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc.xml
@@ -142,6 +142,7 @@
1
1
+ n
KATA_VM
@@ -175,5 +176,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_laag.xml b/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_laag.xml
index 35688695f..9885a65e1 100644
--- a/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml
index 2856cfa9b..431078665 100644
--- a/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 89a0d0d50..ed5775df1 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -206,5 +206,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
index 020480970..c3231bb76 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -211,6 +211,7 @@
1
1
+ n
POST_STD_VM
@@ -247,5 +248,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
index 8466a6963..1cb9bd0cc 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/industry.xml b/misc/config_tools/data/whl-ipc-i5/industry.xml
index be94abb0f..ab25a9c69 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry.xml
@@ -182,6 +182,7 @@
1
1
+ n
POST_STD_VM
@@ -220,6 +221,7 @@
1
1
+ n
POST_STD_VM
@@ -258,6 +260,7 @@
1
1
+ n
POST_STD_VM
@@ -296,6 +299,7 @@
1
1
+ n
POST_STD_VM
@@ -334,6 +338,7 @@
1
1
+ n
KATA_VM
@@ -369,5 +374,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_hardrt.xml
index effa153fd..3fca352a9 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_hardrt.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_vxworks.xml
index acca49478..38c661adc 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_vxworks.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_waag.xml b/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_waag.xml
index 2f99b8bfb..b5c384f33 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/industry_launch_2uos.xml b/misc/config_tools/data/whl-ipc-i5/industry_launch_2uos.xml
index 2f5821d0c..def6478c2 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry_launch_2uos.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/industry_launch_6uos.xml b/misc/config_tools/data/whl-ipc-i5/industry_launch_6uos.xml
index 618d914ac..8ebc2dec5 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry_launch_6uos.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry_launch_6uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
@@ -90,6 +92,7 @@
ovmf
Disable
+ n
@@ -130,6 +133,7 @@
ovmf
Disable
+ n
@@ -170,6 +174,7 @@
ovmf
Disable
+ n
@@ -210,6 +215,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 93d188881..4b06ba7f6 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -143,6 +143,7 @@
1
1
+ n
KATA_VM
@@ -176,5 +177,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml
index c05254183..f223a66b2 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
@@ -14,7 +15,6 @@
-
Disable
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
index 47728c454..eae42a959 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -14,7 +15,6 @@
-
Disable
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index bdc1e1694..5503c2460 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -206,5 +206,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
index 78a39fb76..dad0d7643 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
@@ -211,6 +211,7 @@
1
1
+ n
POST_STD_VM
@@ -247,5 +248,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml
index f13ea30dd..503d387e6 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/industry.xml b/misc/config_tools/data/whl-ipc-i7/industry.xml
index f5e35a4ad..d7214fc48 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry.xml
@@ -144,6 +144,7 @@
1
1
+ n
POST_RT_VM
@@ -182,6 +183,7 @@
1
1
+ n
POST_STD_VM
@@ -220,6 +222,7 @@
1
1
+ n
POST_STD_VM
@@ -258,6 +261,7 @@
1
1
+ n
POST_STD_VM
@@ -296,6 +300,7 @@
1
1
+ n
POST_STD_VM
@@ -334,6 +339,7 @@
1
1
+ n
KATA_VM
@@ -369,5 +375,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_hardrt.xml b/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_hardrt.xml
index 534c5beca..3631c3927 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_hardrt.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_vxworks.xml b/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_vxworks.xml
index 32946990e..2da2eaf8a 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_vxworks.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_waag.xml b/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_waag.xml
index 23b6dc552..c9a2756a7 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry_launch_1uos_waag.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/industry_launch_2uos.xml b/misc/config_tools/data/whl-ipc-i7/industry_launch_2uos.xml
index 377b8ff0a..36af0fa1f 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry_launch_2uos.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry_launch_2uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/industry_launch_6uos.xml b/misc/config_tools/data/whl-ipc-i7/industry_launch_6uos.xml
index c4ba9fc3f..225098faa 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry_launch_6uos.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry_launch_6uos.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n
@@ -49,6 +50,7 @@
ovmf
Disable
+ n
@@ -90,6 +92,7 @@
ovmf
Disable
+ n
@@ -130,6 +133,7 @@
ovmf
Disable
+ n
@@ -170,6 +174,7 @@
ovmf
Disable
+ n
@@ -210,6 +215,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc.xml b/misc/config_tools/data/whl-ipc-i7/sdc.xml
index 69db00df9..1f7065c5a 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc.xml
@@ -147,6 +147,7 @@
1
1
+ n
KATA_VM
@@ -180,5 +181,6 @@
1
1
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_laag.xml b/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_laag.xml
index c0f4893c9..b8f02308a 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_laag.xml
@@ -7,6 +7,7 @@
ovmf
Disable
+ n
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_zephyr.xml
index 9c3b60776..cd0c5fceb 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc_launch_1uos_zephyr.xml
@@ -7,6 +7,7 @@
ovmf
Enable
+ n