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 962bfca4d..e0c67ad76 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
@@ -6,7 +6,7 @@
ovmf
Disable
- vuart1(tty)
+
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 779efbbb7..3fc88fa69 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
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 387ee2192..3ae0d6db2 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
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 fd4cfd2b9..7fe39bbc4 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
@@ -6,7 +6,7 @@
gvtd
ovmf
Disable
- vuart1(pty)
+
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 5472babe6..ce1869fbc 100644
--- a/misc/config_tools/data/generic_board/industry_launch_2uos.xml
+++ b/misc/config_tools/data/generic_board/industry_launch_2uos.xml
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 fb080ad6a..23363e5ea 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_1uos_hardrt.xml
@@ -6,7 +6,7 @@
ovmf
Disable
- vuart1(tty)
+
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml b/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml
index bc323c5c2..7add37070 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml
@@ -49,7 +49,7 @@
ovmf
Disable
- vuart1(tty)
+
diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml b/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml
index 46f8bb8ca..97c65018d 100644
--- a/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml
+++ b/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml
@@ -49,7 +49,7 @@
ovmf
Disable
- vuart1(tty)
+
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 17190406b..61ed641c1 100644
--- a/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/nuc6cayh/sdc_launch_1uos_laag.xml
@@ -6,7 +6,7 @@
gvtd
ovmf
Disable
- vuart1(pty)
+
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 5ed329a14..90d962518 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_1uos_hardrt.xml
@@ -6,7 +6,7 @@
ovmf
Disable
- vuart1(tty)
+
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml
index d5c239245..af0eb710d 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml
index aa9ae6d6c..708cee4b2 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 43070ed87..b1a478262 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc_launch_1uos_laag.xml
@@ -6,7 +6,7 @@
gvtd
ovmf
Disable
- vuart1(pty)
+
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 3bab1c334..6ab31fb04 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 fee1fabb4..35688695f 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
@@ -6,7 +6,7 @@
gvtd
ovmf
Disable
- vuart1(pty)
+
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 7cbba2350..effa153fd 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
@@ -6,7 +6,7 @@
ovmf
Disable
- vuart1(tty)
+
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 d6dddbbb0..2f5821d0c 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
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 2de987b3f..618d914ac 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
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 d684b0eba..c05254183 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
@@ -6,7 +6,7 @@
gvtd
ovmf
Disable
- vuart1(pty)
+
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 21b9edf4e..534c5beca 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
@@ -6,7 +6,7 @@
ovmf
Disable
- vuart1(tty)
+
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 6ddc0ad76..377b8ff0a 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
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 36073860b..c4ba9fc3f 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
@@ -48,7 +48,7 @@
ovmf
Disable
- vuart1(tty)
+
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 9c8f6dff4..c0f4893c9 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
@@ -6,7 +6,7 @@
gvtd
ovmf
Disable
- vuart1(pty)
+