From 40140281aeea29d1ac882751708aa64754eeb274 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 29 Nov 2019 13:27:00 +0800 Subject: [PATCH] acrn-config: add rootfs_dev/rootfs_img with virtio-blk item remov rootfs_dev and rootfs_img item and replace them with vritio-blk item. The format for virtio-blk: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img For vbootloader of ovmf: [img path] e.g.:./a/b.img Tracked-On: #4172 Signed-off-by: Wei Liu Acked-by: Victor Sun --- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml | 3 +-- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml | 3 +-- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml | 3 +-- .../xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/generic/hybrid_launch_1uos.xml | 3 +-- .../xmls/config-xmls/generic/industry_launch_1uos.xml | 3 +-- .../xmls/config-xmls/generic/industry_launch_2uos.xml | 6 ++---- .../xmls/config-xmls/generic/sdc_launch_1uos.xml | 3 +-- .../config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml | 3 +-- .../config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml | 3 +-- .../xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml | 3 +-- .../xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml | 6 ++---- .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml | 3 +-- .../config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml | 3 +-- .../config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml | 3 +-- .../config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml | 3 +-- .../xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml | 6 ++---- .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml | 3 +-- .../config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml | 3 +-- .../config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml | 3 +-- .../config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml | 6 ++---- .../xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml | 3 +-- .../config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml | 3 +-- .../config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml | 3 +-- .../config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml | 6 ++---- .../xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml | 3 +-- 34 files changed, 39 insertions(+), 78 deletions(-) diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml index d5c405ff1..71cf580e1 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/mmcblk1p3 - android/android.img virtio-console(hvc0) --pm_notify_channel ioc \ @@ -30,6 +28,7 @@ + /dev/mmcblk1p3:android/android.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml index 41293995c..da2fa2e3f 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/mmcblk1p3 - alios/alios.img virtio-console(hvc0) --pm_notify_channel ioc \ @@ -30,6 +28,7 @@ + /dev/mmcblk1p3:alios/alios.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml index 3846feef5..fc429efe4 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/mmcblk1p3 - clearlinux/clearlinux.img virtio-console(hvc0) --pm_notify_channel ioc \ @@ -30,6 +28,7 @@ + /dev/mmcblk1p3:clearlinux/clearlinux.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml index b5d6ce868..54e7160c6 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/mmcblk0p1 - clearlinux/clearlinux.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /dev/mmcblk0p1:clearlinux/clearlinux.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml index 31717d4c0..8d04ab793 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/mmcblk0p1 - android/android.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /dev/mmcblk0p1:android/android.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml index d455bb9ce..92a9d57fe 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/mmcblk0p1 - clearlinux/clearlinux.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /dev/mmcblk0p1:clearlinux/clearlinux.img diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml index ff8b5f476..963ee0dd1 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml @@ -5,8 +5,6 @@ ovmf - - @@ -29,6 +27,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml index 87010cd1e..3b158a7db 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml @@ -5,8 +5,6 @@ ovmf - - @@ -29,6 +27,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml index bd6361ae6..379944b63 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml @@ -5,8 +5,6 @@ ovmf - - @@ -29,6 +27,7 @@ + @@ -37,8 +36,6 @@ ovmf - - @@ -61,6 +58,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml index d7ab2827f..a93594153 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml @@ -5,8 +5,6 @@ ovmf - - @@ -29,6 +27,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml index 30158d041..f92464b12 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml @@ -5,8 +5,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -27,6 +25,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml index 9e2ce3f21..c21986503 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml @@ -5,8 +5,6 @@ 2048 ovmf - /dev/sda3 - ./VxWorks.img virtio-console(hvc0) @@ -27,6 +25,7 @@ + ./VxWorks.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml index 3b3f04ec2..84cab48b8 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml index cd5ad9c86..d6363affb 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img @@ -36,8 +35,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -58,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml index bfe1dfa47..51aecde19 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/sda3 - home/clear/uos/uos.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml index a3bb3fa0e..ae8e4a554 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml @@ -5,8 +5,6 @@ 128 ovmf - /dev/sda3 - ./zephyr.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./zephyr.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml index a6dc1c183..6b0c4207b 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml @@ -5,8 +5,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -27,6 +25,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml index 015d90243..23933f064 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml @@ -5,8 +5,6 @@ 2048 ovmf - /dev/sda3 - ./VxWorks.img virtio-console(hvc0) @@ -27,6 +25,7 @@ + ./VxWorks.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml index 60a896a25..7a92c5a6b 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml index ae4c1f5f9..220ae4238 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img @@ -36,8 +35,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -58,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml index e5a41a9cc..399f92390 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/sda3 - home/clear/uos/uos.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml index 444eda558..40cfd191d 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml @@ -5,8 +5,6 @@ 128 ovmf - /dev/sda3 - ./zephyr.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./zephyr.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml index 323ba4076..2b9b10fcc 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml @@ -5,8 +5,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -27,6 +25,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml index b221a9484..bc661b457 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml @@ -5,8 +5,6 @@ 2048 ovmf - /dev/sda3 - ./VxWorks.img virtio-console(hvc0) @@ -27,6 +25,7 @@ + ./VxWorks.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml index e3fa1ac1f..16ebddef4 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml index 6d83d4fd2..8348a4bb3 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img @@ -36,8 +35,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -58,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml index c1937861d..ae62edd2a 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/sda3 - home/clear/uos/uos.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml index 0c8e66a79..002aa3aeb 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml @@ -5,8 +5,6 @@ 128 ovmf - /dev/sda3 - ./zephyr.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./zephyr.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml index 77c400b68..45e0cbd31 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml @@ -5,8 +5,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -27,6 +25,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml index 803386f31..e8311ac26 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml @@ -5,8 +5,6 @@ 2048 ovmf - /dev/sda3 - ./VxWorks.img virtio-console(hvc0) @@ -27,6 +25,7 @@ + ./VxWorks.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml index 9414fa9d9..5a9a01610 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml index a1bf12ce7..e7885f3e7 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml @@ -5,8 +5,6 @@ 4096 64 448 8 ovmf - /dev/sda3 - ./win10-ltsc.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./win10-ltsc.img @@ -36,8 +35,6 @@ 1024 ovmf - - virtio-console(hvc0) @@ -58,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml index 27073c461..aa3bb18f3 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml @@ -5,8 +5,6 @@ 2048 64 448 8 ovmf - /dev/sda3 - home/clear/uos/uos.img virtio-console(hvc0) --pm_notify_channel power_button \ @@ -30,6 +28,7 @@ + /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml index 851ed14e7..7509104d8 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml @@ -5,8 +5,6 @@ 128 ovmf - /dev/sda3 - ./zephyr.img com1(ttyS0) @@ -27,6 +25,7 @@ + ./zephyr.img