From 28ef2f509bb7e96d567e80b63b17855377a944a9 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 20 Apr 2020 16:59:40 +0800 Subject: [PATCH] acrn-config: remove sdc2 config xmls Remove sdc2 scenario since the VM launch requirement under this scenario will be satisfied by industry scenario. Tracked-On: #4641 Signed-off-by: Wei Liu Acked-by: Victor Sun --- .../xmls/config-xmls/apl-mrb/sdc2.xml | 181 ------------------ .../xmls/config-xmls/apl-up2/sdc2.xml | 181 ------------------ .../xmls/config-xmls/generic/sdc2.xml | 179 ----------------- .../xmls/config-xmls/nuc6cayh/sdc2.xml | 181 ------------------ .../xmls/config-xmls/nuc7i7dnb/sdc2.xml | 180 ----------------- .../xmls/config-xmls/whl-ipc-i5/sdc2.xml | 180 ----------------- .../xmls/config-xmls/whl-ipc-i7/sdc2.xml | 180 ----------------- 7 files changed, 1262 deletions(-) delete mode 100644 misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml delete mode 100644 misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml delete mode 100644 misc/acrn-config/xmls/config-xmls/generic/sdc2.xml delete mode 100644 misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml delete mode 100644 misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml delete mode 100644 misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml delete mode 100644 misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml deleted file mode 100644 index da7861b15..000000000 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - n - /dev/ttyS2 - 5 - 5 - 3 - 7 - 0x40000 - - - - y - SCHED_NOOP - y - y - n - y - n - n - - - - 0x2000 - 0x0b800000 - 0x00400000 - 0x00010000 - 0x200000000 - 0x400000000 - 0x400000000 - - - - 0x100 - 256 - 1 - 0 - 96 - 120 - 64 - 16 - 16 - - - - 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - /dev/mmcblk1p1 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 - reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_initial_modeset=1 i915.enable_guc=0x02 video=DP-1:d video=DP-2:d cma=64M@0- panic_print=0x1f - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml deleted file mode 100644 index 9ee60d44c..000000000 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - - y - SCHED_NOOP - y - y - n - y - n - n - - - - 0x2000 - 0x0b800000 - 0x00400000 - 0x00010000 - 0x200000000 - 0x400000000 - 0x400000000 - - - - 0x100 - 256 - 1 - 0 - 96 - 120 - 64 - 16 - 16 - - - - 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - /dev/mmcblk0p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 - reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0- - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml deleted file mode 100644 index 4b025a6df..000000000 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc2.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml deleted file mode 100644 index d3c503dc3..000000000 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc2.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - - y - SCHED_NOOP - y - y - n - y - n - n - - - - 0x2000 - 0x0b800000 - 0x00400000 - 0x00010000 - 0x200000000 - 0x400000000 - 0x400000000 - - - - 0x100 - 256 - 1 - 0 - 96 - 120 - 64 - 16 - 16 - - - - 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml deleted file mode 100644 index 27b7afb19..000000000 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc2.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - - y - SCHED_NOOP - y - y - n - y - n - n - - - - 0x2000 - 0x0b800000 - 0x00400000 - 0x00010000 - 0x200000000 - 0x400000000 - 0x400000000 - - - - 0x100 - 256 - 1 - 0 - 96 - 120 - 64 - 16 - 16 - - - - 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml deleted file mode 100644 index e65070f5c..000000000 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc2.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - - y - SCHED_NOOP - y - y - n - y - n - n - - - - 0x2000 - 0x0b800000 - 0x00400000 - 0x00010000 - 0x200000000 - 0x400000000 - 0x400000000 - - - - 0x100 - 256 - 1 - 0 - 96 - 120 - 64 - 16 - 16 - - - - 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml deleted file mode 100644 index ca47da675..000000000 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc2.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - n - /dev/ttyS0 - 5 - 5 - 3 - 7 - 0x40000 - - - - y - SCHED_NOOP - y - y - n - y - n - n - - - - 0x2000 - 0x0b800000 - 0x00400000 - 0x00010000 - 0x200000000 - 0x400000000 - 0x400000000 - - - - 0x100 - 256 - 1 - 0 - 96 - 120 - 64 - 16 - 16 - - - - 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi - - - - - SOS_VM - ACRN SOS VM - - 0 - - - 0 - - - 0 - CONFIG_SOS_RAM_SIZE - - - ACRN Service OS - KERNEL_BZIMAGE - Linux_bzImage - - SOS_VM_BOOTARGS - - - VUART_LEGACY_PIO - SOS_COM1_BASE - SOS_COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - SOS_COM2_IRQ - 1 - 1 - - - - - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 - - - - - POST_STD_VM - - 0 - - - 1 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 2 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - - - POST_STD_VM - - 0 - - - 3 - - - 0 - - - 0 - 0 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM1_IRQ - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - -