diff --git a/misc/acrn-config/library/scenario_cfg_lib.py b/misc/acrn-config/library/scenario_cfg_lib.py
index bd4264841..4ac0a3e11 100644
--- a/misc/acrn-config/library/scenario_cfg_lib.py
+++ b/misc/acrn-config/library/scenario_cfg_lib.py
@@ -434,20 +434,6 @@ def os_kern_entry_addr_check(id_kern_entry_addr_dic, prime_item, item):
ERR_LIST[key] = "VM os config kernel entry address should Hex format"
-def os_kern_root_dev_check(id_kern_rootdev_dic, prime_item, item):
- """
- Check os kernel rootfs partitions
- :param prime_item: the prime item in xml file
- :param item: vm os config rootdev item in xml
- :return: None
- """
-
- for id_key, kern_rootdev in id_kern_rootdev_dic.items():
- if not kern_rootdev:
- key = "vm:id={},{},{}".format(id_key, prime_item, item)
- ERR_LIST[key] = "VM os config kernel root device should not empty"
-
-
def pci_devs_check(pci_bdf_devs, branch_tag, tag_str):
"""
Check vm pci devices
diff --git a/misc/acrn-config/scenario_config/scenario_cfg_gen.py b/misc/acrn-config/scenario_config/scenario_cfg_gen.py
index b911cf9b9..97c39a353 100755
--- a/misc/acrn-config/scenario_config/scenario_cfg_gen.py
+++ b/misc/acrn-config/scenario_config/scenario_cfg_gen.py
@@ -54,9 +54,6 @@ def get_scenario_item_values(board_info, scenario_info):
# pre board_private
(scenario_item_values["vm,board_private,rootfs"], num) = board_cfg_lib.get_rootfs(board_info)
- # os config
- (scenario_item_values["vm,os_config,rootfs"], num) = board_cfg_lib.get_rootfs(board_info)
-
scenario_item_values["hv,DEBUG_OPTIONS,RELEASE"] = hv_cfg_lib.N_Y
scenario_item_values["hv,DEBUG_OPTIONS,NPK_LOGLEVEL"] = hv_cfg_lib.get_select_range("DEBUG_OPTIONS", "LOG_LEVEL")
scenario_item_values["hv,DEBUG_OPTIONS,MEM_LOGLEVEL"] = hv_cfg_lib.get_select_range("DEBUG_OPTIONS", "LOG_LEVEL")
diff --git a/misc/acrn-config/scenario_config/scenario_item.py b/misc/acrn-config/scenario_config/scenario_item.py
index 131014d02..4eeb56bdd 100644
--- a/misc/acrn-config/scenario_config/scenario_item.py
+++ b/misc/acrn-config/scenario_config/scenario_item.py
@@ -76,8 +76,6 @@ class CfgOsKern:
kern_console = {}
kern_load_addr = {}
kern_entry_addr = {}
- kern_root_dev = {}
- kern_args_append = {}
ramdisk_mod = {}
def __init__(self, scenario_file):
@@ -101,12 +99,8 @@ class CfgOsKern:
self.scenario_info, "os_config", "kern_load_addr")
self.kern_entry_addr = common.get_leaf_tag_map(
self.scenario_info, "os_config", "kern_entry_addr")
- self.kern_root_dev = common.get_leaf_tag_map(
- self.scenario_info, "os_config", "rootfs")
self.ramdisk_mod = common.get_leaf_tag_map(
self.scenario_info, "os_config", "ramdisk_mod")
- self.kern_args_append = common.get_leaf_tag_map(
- self.scenario_info, "boot_private", "bootargs")
def check_item(self):
"""
@@ -120,7 +114,6 @@ class CfgOsKern:
scenario_cfg_lib.os_kern_console_check(self.kern_console, "DEBUG_OPTIONS", "SERIAL_CONSOLE")
scenario_cfg_lib.os_kern_load_addr_check(self.kern_load_addr, "os_config", "kern_load_addr")
scenario_cfg_lib.os_kern_entry_addr_check(self.kern_entry_addr, "os_config", "kern_entry_addr")
- scenario_cfg_lib.os_kern_root_dev_check(self.kern_root_dev, "os_config", "rootdev")
class VuartInfo:
diff --git a/misc/acrn-config/scenario_config/vm_configurations_c.py b/misc/acrn-config/scenario_config/vm_configurations_c.py
index 082d61be0..0f9af4e2a 100644
--- a/misc/acrn-config/scenario_config/vm_configurations_c.py
+++ b/misc/acrn-config/scenario_config/vm_configurations_c.py
@@ -308,7 +308,6 @@ def gen_pre_launch_vm(vm_type, vm_i, vm_info, config):
if vm_i in vm_info.os_cfg.kern_args.keys() and vm_info.os_cfg.kern_args[vm_i]:
print("\t\t\t.bootargs = VM{0}_CONFIG_OS_BOOTARG_CONSOLE\t\\".format(vm_i), file=config)
print("\t\t\t\tVM{0}_CONFIG_OS_BOOTARG_MAXCPUS\t\t\\".format(vm_i), file=config)
- print("\t\t\t\tVM{0}_CONFIG_OS_BOOTARG_ROOT\t\t\\".format(vm_i), file=config)
split_cmdline(vm_info.os_cfg.kern_args[vm_i].strip(), config)
print("\t\t},", file=config)
# VUART
diff --git a/misc/acrn-config/scenario_config/vm_configurations_h.py b/misc/acrn-config/scenario_config/vm_configurations_h.py
index 4b55d6873..886dc7007 100644
--- a/misc/acrn-config/scenario_config/vm_configurations_h.py
+++ b/misc/acrn-config/scenario_config/vm_configurations_h.py
@@ -85,9 +85,6 @@ def gen_pre_launch_vm(vm_info, config):
vm_i, vm_info.mem_info.mem_start_hpa2[vm_i]), file=config)
print("#define VM{0}_CONFIG_MEM_SIZE_HPA2\t\t{1}UL".format(
vm_i, vm_info.mem_info.mem_size_hpa2[vm_i]), file=config)
- if vm_info.os_cfg.kern_root_dev:
- print('#define VM{0}_CONFIG_OS_BOOTARG_ROOT\t\t"root={1} "'.format(
- vm_i, vm_info.os_cfg.kern_root_dev[vm_i]), file=config)
print('#define VM{0}_CONFIG_OS_BOOTARG_MAXCPUS\t\t"maxcpus={1} "'.format(vm_i, cpu_bits['cpu_num']), file=config)
if vm_info.os_cfg.kern_console:
diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
index dc8f41a0e..04dee8479 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
@@ -76,9 +76,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/mmcblk1p1
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw root=/dev/mmcblk1p1 rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -127,9 +126,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
index 27a9c84c5..23c044da7 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
@@ -76,9 +76,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -126,9 +125,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
index 7ad615d6f..4451e9e5b 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
@@ -77,9 +77,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -128,9 +127,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml
index 189d6331a..e52f5b750 100644
--- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml
@@ -74,9 +74,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -126,9 +125,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml
index 468674390..92ecb6e1a 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml
@@ -78,9 +78,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -130,9 +129,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
index af356bab3..02ba761a3 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
@@ -77,9 +77,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -128,9 +127,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
index 625b75450..23313d6f8 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
@@ -77,9 +77,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -129,9 +128,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/template/PRE_STD_VM.xml b/misc/acrn-config/xmls/config-xmls/template/PRE_STD_VM.xml
index fd968c71a..676c128ab 100644
--- a/misc/acrn-config/xmls/config-xmls/template/PRE_STD_VM.xml
+++ b/misc/acrn-config/xmls/config-xmls/template/PRE_STD_VM.xml
@@ -26,7 +26,6 @@
-
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
index d3447b03c..11b1e3fa5 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
@@ -77,9 +77,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -128,9 +127,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
index ac011c2b4..437800559 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
@@ -77,9 +77,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
@@ -128,9 +127,8 @@
KERNEL_BZIMAGE
Linux_bzImage
- /dev/sda3
- rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+ rw rootwait root=/dev/sda3 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable