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 79874f258..6443b958d 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 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 cfa42668e..a7de79743 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 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 4b94fa4f6..2245f57a9 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 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 5b7ff037f..17db36ad9 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 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 a6c37d5a2..425cadc23 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 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 968324af7..ebefea4f8 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 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 d2fc95b26..2b5632406 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 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 5b251af9c..e61c39615 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 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 d0e5f0c22..9f940010c 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 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 dd2cf913c..f35654836 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 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 9b1a9c768..70eb90713 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 n @@ -50,6 +51,7 @@ ovmf Disable + n 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 77bf2c4e5..4a2d5d9fe 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 n @@ -50,6 +51,7 @@ ovmf Disable + n n @@ -92,6 +94,7 @@ ovmf Disable + n n @@ -133,6 +136,7 @@ ovmf Disable + n n @@ -174,6 +178,7 @@ ovmf Disable + n n @@ -215,6 +220,7 @@ ovmf Disable + n 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 572889aa3..27dbd4954 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 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 d5bcaea3f..af81033d7 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 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 5f2086e12..7f3406b75 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 n @@ -50,6 +51,7 @@ ovmf Disable + n n diff --git a/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml b/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml index af2c05e9c..570da30f2 100644 --- a/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml +++ b/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml @@ -8,6 +8,7 @@ Enable n + n @@ -49,6 +50,7 @@ Disable n + 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 f9bc8615f..9429dcc4d 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 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 9d72652c9..62c020347 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 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 8e65ee5db..504162f8a 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 n diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml b/misc/config_tools/data/nuc6cayh/industry_launch_2uos.xml index 1874477ab..90289edd6 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 n @@ -51,6 +52,7 @@ ovmf Disable + n n diff --git a/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml b/misc/config_tools/data/nuc6cayh/industry_launch_6uos.xml index 736bdcd63..b8090f7e3 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 n @@ -51,6 +52,7 @@ ovmf Disable + n n @@ -94,6 +96,7 @@ ovmf Disable + n n @@ -135,6 +138,7 @@ ovmf Disable + n n @@ -176,6 +180,7 @@ ovmf Disable + n n @@ -217,6 +222,7 @@ ovmf Disable + n 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 c7df1068c..b440afb00 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 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 ccad78e7f..166b62bf7 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 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 aa6a83a21..167bbd860 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 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 65b9c7d17..f9ccf1ba7 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 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 1ea2667e4..fe86697dd 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 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 abda8cb0f..1f5bad956 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 n diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_2uos.xml index 7daf22708..748fb3a03 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 n @@ -50,6 +51,7 @@ ovmf Disable + n n diff --git a/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml b/misc/config_tools/data/nuc7i7dnb/industry_launch_6uos.xml index 1ca6d24c2..995277bfb 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 n @@ -50,6 +51,7 @@ ovmf Disable + n n @@ -92,6 +94,7 @@ ovmf Disable + n n @@ -133,6 +136,7 @@ ovmf Disable + n n @@ -174,6 +178,7 @@ ovmf Disable + n n @@ -215,6 +220,7 @@ ovmf Disable + n 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 ebad1621a..ad348dc1d 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 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 27ea4c733..8eaf68f8f 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 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 a99f8073e..142ad7f43 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 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 5b86d2ec1..0d33f0584 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 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 9a4860a57..4a49611b0 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 n @@ -50,6 +51,7 @@ ovmf Disable + n 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 333287e97..496724ada 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 n @@ -51,6 +52,7 @@ Disable n + n @@ -92,6 +94,7 @@ ovmf Disable + n n @@ -133,6 +136,7 @@ ovmf Disable + n n @@ -174,6 +178,7 @@ ovmf Disable + n n @@ -215,6 +220,7 @@ ovmf Disable + n 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 9885a65e1..4219f1b8b 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 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 431078665..79b274b6e 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 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 1cb9bd0cc..0558e2632 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 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 3fca352a9..84cfacd01 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 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 38c661adc..c591941ef 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 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 b5c384f33..8d3bc0c57 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 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 def6478c2..4046ff757 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 n @@ -50,6 +51,7 @@ ovmf Disable + n 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 8ebc2dec5..81ff97b5b 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 n @@ -50,6 +51,7 @@ ovmf Disable + n n @@ -92,6 +94,7 @@ ovmf Disable + n n @@ -133,6 +136,7 @@ ovmf Disable + n n @@ -174,6 +178,7 @@ ovmf Disable + n n @@ -215,6 +220,7 @@ ovmf Disable + n 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 f223a66b2..28c176950 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 n 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 eae42a959..c5e064aa6 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 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 503d387e6..0e7874b38 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 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 3631c3927..2d71e6426 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 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 2da2eaf8a..649a64bf1 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 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 c9a2756a7..2450105f9 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 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 36af0fa1f..b66360a25 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 n @@ -50,6 +51,7 @@ ovmf Disable + n 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 225098faa..8b8bca455 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 n @@ -50,6 +51,7 @@ ovmf Disable + n n @@ -92,6 +94,7 @@ ovmf Disable + n n @@ -133,6 +136,7 @@ ovmf Disable + n n @@ -174,6 +178,7 @@ ovmf Disable + n n @@ -215,6 +220,7 @@ ovmf Disable + n 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 b8f02308a..3e88f56eb 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 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 cd0c5fceb..db4e2e550 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 n diff --git a/misc/config_tools/launch_config/com.py b/misc/config_tools/launch_config/com.py index f9741e11d..b365ed904 100644 --- a/misc/config_tools/launch_config/com.py +++ b/misc/config_tools/launch_config/com.py @@ -585,6 +585,11 @@ def dm_arg_set(names, sel, virt_io, dm, vmid, config): # pm_channel set if dm['pm_channel'][vmid] and dm['pm_channel'][vmid] != None: pm_key = dm['pm_channel'][vmid] + pm_vuart = "--pm_notify_channel uart" + if vmid in dm["allow_trigger_s5"] and dm["allow_trigger_s5"][vmid] == 'y': + pm_vuart = pm_vuart + ",allow_trigger_s5 " + else: + pm_vuart = pm_vuart + " " if pm_key == "vuart1(tty)": vuart_base = launch_cfg_lib.get_vuart1_from_scenario(sos_vmid + vmid) if vuart_base == "INVALID_COM_BASE": @@ -592,7 +597,9 @@ def dm_arg_set(names, sel, virt_io, dm, vmid, config): launch_cfg_lib.ERR_LIST[err_key] = "vuart1 of VM{} in scenario file should select 'SOS_COM2_BASE'".format(sos_vmid + vmid) return scenario_cfg_lib.get_sos_vuart_settings() - print(" {} \\".format(launch_cfg_lib.PM_CHANNEL_DIC[pm_key] + scenario_cfg_lib.SOS_UART1_VALID_NUM), file=config) + print(" {} \\".format(pm_vuart + launch_cfg_lib.PM_CHANNEL_DIC[pm_key] + scenario_cfg_lib.SOS_UART1_VALID_NUM), file=config) + elif pm_key == "vuart1(pty)": + print(" {} \\".format(pm_vuart + launch_cfg_lib.PM_CHANNEL_DIC[pm_key]), file=config) else: print(" {} \\".format(launch_cfg_lib.PM_CHANNEL_DIC[pm_key]), file=config) diff --git a/misc/config_tools/launch_config/launch_cfg_gen.py b/misc/config_tools/launch_config/launch_cfg_gen.py index 8a632c3d3..bf46134bf 100644 --- a/misc/config_tools/launch_config/launch_cfg_gen.py +++ b/misc/config_tools/launch_config/launch_cfg_gen.py @@ -52,7 +52,8 @@ def get_launch_item_values(board_info, scenario_info=None): launch_item_values['uos,vuart0'] = launch_cfg_lib.DM_VUART0 launch_item_values['uos,poweroff_channel'] = launch_cfg_lib.PM_CHANNEL launch_item_values["uos,cpu_affinity"] = board_cfg_lib.get_processor_info() - launch_item_values['uos,enable_ptm'] = launch_cfg_lib.PTM + launch_item_values['uos,enable_ptm'] = launch_cfg_lib.y_n + launch_item_values['uos,allow_trigger_s5'] = launch_cfg_lib.y_n launch_cfg_lib.set_shm_regions(launch_item_values, scenario_info) launch_cfg_lib.set_pci_vuarts(launch_item_values, scenario_info) diff --git a/misc/config_tools/launch_config/launch_item.py b/misc/config_tools/launch_config/launch_item.py index a1c046aa0..7d89304fe 100644 --- a/misc/config_tools/launch_config/launch_item.py +++ b/misc/config_tools/launch_config/launch_item.py @@ -37,6 +37,7 @@ class AcrnDmArgs: self.args["communication_vuarts"] = common.get_leaf_tag_map(self.launch_info, "communication_vuarts", "communication_vuart") self.args["console_vuart"] = common.get_leaf_tag_map(self.launch_info, "console_vuart") self.args["enable_ptm"] = common.get_leaf_tag_map(self.launch_info, "enable_ptm") + self.args["allow_trigger_s5"] = common.get_leaf_tag_map(self.launch_info, "allow_trigger_s5") def check_item(self): (rootfs, num) = board_cfg_lib.get_rootfs(self.board_info) @@ -45,7 +46,8 @@ class AcrnDmArgs: launch_cfg_lib.mem_size_check(self.args["mem_size"], "mem_size") launch_cfg_lib.args_aval_check(self.args["vbootloader"], "vbootloader", launch_cfg_lib.BOOT_TYPE) launch_cfg_lib.args_aval_check(self.args["vuart0"], "vuart0", launch_cfg_lib.DM_VUART0) - launch_cfg_lib.args_aval_check(self.args["enable_ptm"], "enable_ptm", launch_cfg_lib.PTM) + launch_cfg_lib.args_aval_check(self.args["enable_ptm"], "enable_ptm", launch_cfg_lib.y_n) + launch_cfg_lib.args_aval_check(self.args["allow_trigger_s5"], "allow_trigger_s5", launch_cfg_lib.y_n) cpu_affinity = launch_cfg_lib.uos_cpu_affinity(self.args["cpu_affinity"]) err_dic = scenario_cfg_lib.vm_cpu_affinity_check(self.launch_info, cpu_affinity, "pcpu_id") launch_cfg_lib.ERR_LIST.update(err_dic) diff --git a/misc/config_tools/library/launch_cfg_lib.py b/misc/config_tools/library/launch_cfg_lib.py index c45b9a935..96b667691 100644 --- a/misc/config_tools/library/launch_cfg_lib.py +++ b/misc/config_tools/library/launch_cfg_lib.py @@ -15,7 +15,7 @@ ERR_LIST = {} BOOT_TYPE = ['no', 'vsbl', 'ovmf'] RTOS_TYPE = ['no', 'Soft RT', 'Hard RT'] DM_VUART0 = ['Disable', 'Enable'] -PTM = ['y', 'n'] +y_n = ['y', 'n'] UOS_TYPES = ['CLEARLINUX', 'ANDROID', 'ALIOS', 'PREEMPT-RT LINUX', 'VXWORKS', 'WINDOWS', 'ZEPHYR', 'YOCTO', 'UBUNTU', 'GENERIC LINUX'] LINUX_LIKE_OS = ['CLEARLINUX', 'PREEMPT-RT LINUX', 'YOCTO', 'UBUNTU', 'GENERIC LINUX'] @@ -52,8 +52,8 @@ PM_CHANNEL_DIC = { None:'', 'IOC':'--pm_notify_channel ioc', 'PowerButton':'--pm_notify_channel power_button', - 'vuart1(pty)':'--pm_notify_channel uart \\\n --pm_by_vuart pty,/run/acrn/life_mngr_$vm_name \\\n -l com2,/run/acrn/life_mngr_$vm_name', - 'vuart1(tty)':'--pm_notify_channel uart --pm_by_vuart tty,/dev/', + 'vuart1(pty)':'--pm_by_vuart pty,/run/acrn/life_mngr_$vm_name \\\n -l com2,/run/acrn/life_mngr_$vm_name', + 'vuart1(tty)':'--pm_by_vuart tty,/dev/', } MOUNT_FLAG_DIC = {} @@ -67,7 +67,7 @@ def usage(file_name): print('board_info_file : file name of the board info') print('scenario_info_file : file name of the scenario info') print('launch_info_file : file name of the launch info') - print('uosid : this is the relateive id for post launch vm in scenario info XML:[1..max post launch vm]') + print('uosid : this is the relative id for post launch vm in scenario info XML:[1..max post launch vm]') print('output folder : path to acrn-hypervisor_folder')