github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-22 09:17:58 +00:00
Code Issues Projects Releases Wiki Activity

HV: move sos bootargs to vm configurations

Browse Source 
Previously the bootargs of SOS_VM is stored in a text file and stitched
into multiboot mods[0].string whereas the bootargs of PRE_LAUNCHED_VM is
stored in vm_configurations.c. Given the mods[].string will be used to
store Kernel image signature under hybrid mode, move the bootargs of SOS_VM
to vm configurations also to make it consistent with PRE_LAUNCHED_VM;

Tracked-On: #3214

Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Victor Sun
2019-06-02 23:33:24 +08:00
committed by wenlingz
parent 8256ba2015
commit d0fa83b2cb
11 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h
View File

@@ -10,6 +10,27 @@
#define ROOTFS_0 "root=/dev/sda3 "
#define ROOTFS_1 "root=/dev/mmcblk1p1 "
#define SOS_ROOTFS ROOTFS_1
#define SOS_CONSOLE "console=ttyS2 "
#ifndef CONFIG_RELEASE
#define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \
"memmap=0x400000$0x6da00000 " \
"ramoops.mem_address=0x6da00000 " \
"ramoops.mem_size=0x400000 " \
"ramoops.console_size=0x200000 " \
"reboot_panic=p,w "
#else
#define BOOTARG_DEBUG ""
#endif
#define SOS_BOOTARGS_DIFF BOOTARG_DEBUG \
"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"
#endif /* MISC_CFG_H */

17
hypervisor/arch/x86/configs/apl-up2/misc_cfg.h
View File

@@ -10,6 +10,23 @@
#define ROOTFS_0 "root=/dev/sda3 "
#define ROOTFS_1 "root=/dev/mmcblk0p1 "
#define SOS_ROOTFS ROOTFS_1
#define SOS_CONSOLE "console=ttyS0 "
#ifndef CONFIG_RELEASE
#define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \
"memmap=0x400000$0x6da00000 " \
"ramoops.mem_address=0x6da00000 " \
"ramoops.mem_size=0x400000 " \
"ramoops.console_size=0x200000 " \
"reboot_panic=p,w "
#else
#define BOOTARG_DEBUG ""
#endif
#define SOS_BOOTARGS_DIFF BOOTARG_DEBUG \
"module_blacklist=dwc3_pci " \
"i915.enable_guc=0x02 " \
"cma=64M@0- "
#endif /* MISC_CFG_H */

7
hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h
View File

@@ -9,6 +9,13 @@
#define ROOTFS_0 "root=/dev/sda3 "
#define SOS_ROOTFS ROOTFS_0
#define SOS_CONSOLE "console=ttyS0 "
#ifndef CONFIG_RELEASE
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
#else
#define SOS_BOOTARGS_DIFF ""
#endif
#endif /* MISC_CFG_H */

7
hypervisor/arch/x86/configs/generic/misc_cfg.h
View File

@@ -10,6 +10,13 @@
#define ROOTFS_0 "root=/dev/sda3 "
#define ROOTFS_1 "root=/dev/mmcblk0p1 "
#define SOS_ROOTFS ROOTFS_0
#define SOS_CONSOLE "console=ttyS0 "
#ifndef CONFIG_RELEASE
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
#else
#define SOS_BOOTARGS_DIFF ""
#endif
#endif /* MISC_CFG_H */

7
hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h
View File

@@ -9,6 +9,13 @@
#define ROOTFS_0 "root=/dev/sda3 "
#define SOS_ROOTFS ROOTFS_0
#define SOS_CONSOLE "console=ttyS0 "
#ifndef CONFIG_RELEASE
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
#else
#define SOS_BOOTARGS_DIFF ""
#endif
#endif /* MISC_CFG_H */

7
hypervisor/arch/x86/configs/nuc7i7bnh/misc_cfg.h
View File

@@ -10,6 +10,13 @@
#define ROOTFS_0 "root=/dev/sda3 "
#define ROOTFS_1 "root=/dev/nvme0n1p3 "
#define SOS_ROOTFS ROOTFS_0
#define SOS_CONSOLE "console=ttyS0 "
#ifndef CONFIG_RELEASE
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
#else
#define SOS_BOOTARGS_DIFF ""
#endif
#endif /* MISC_CFG_H */