HV: sanitize config file for whl-ipc-i5

- remove limit of CONFIG_HV_RAM_SIZE which is for scenario of 2 VMs only,
the default size from Kconfig could build scenario which up to 5 VMs;

- rename whl-ipc-i5_acpi_info.h to platform_acpi_info.h, since the former
one should be generated by acrn-config tool;

- add SOS related macros in misc.h, otherwise build scenarios which has
SOS VM would be failed;

Tracked-On: #4463

Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Victor Sun 2020-03-05 10:46:55 +08:00 committed by wenlingz
parent 64bf4fb8f4
commit b6684f5b61
3 changed files with 15 additions and 3 deletions

View File

@ -6,5 +6,4 @@ CONFIG_BOARD="whl-ipc-i5"
CONFIG_SERIAL_LEGACY=y CONFIG_SERIAL_LEGACY=y
CONFIG_SERIAL_PIO_BASE=0x3F8 CONFIG_SERIAL_PIO_BASE=0x3F8
CONFIG_HV_RAM_START=0x11000000 CONFIG_HV_RAM_START=0x11000000
CONFIG_HV_RAM_SIZE=0x7800000
CONFIG_RDT_ENABLED=n CONFIG_RDT_ENABLED=n

View File

@ -8,12 +8,25 @@
#ifndef MISC_CFG_H #ifndef MISC_CFG_H
#define MISC_CFG_H #define MISC_CFG_H
#define MAX_PCPU_NUM 4U #define MAX_PCPU_NUM 4U
#define MAX_PLATFORM_CLOS_NUM 0U #define MAX_PLATFORM_CLOS_NUM 0U
#define ROOTFS_0 "root=/dev/nvme0n1p3 " #define ROOTFS_0 "root=/dev/nvme0n1p3 "
#define ROOTFS_1 "root=/dev/sda3 " #define ROOTFS_1 "root=/dev/sda3 "
#define SOS_ROOTFS ROOTFS_1
#define SOS_CONSOLE "console=ttyS0 "
#define SOS_COM1_BASE 0x3F8U
#define SOS_COM1_IRQ 4U
#define SOS_COM2_BASE 0x2F8U
#define SOS_COM2_IRQ 3U
#ifndef CONFIG_RELEASE
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \
"memmap=0x200000$0x1fe00000 "
#else
#define SOS_BOOTARGS_DIFF ""
#endif
#define MAX_HIDDEN_PDEVS_NUM 0U #define MAX_HIDDEN_PDEVS_NUM 0U

View File

@ -27,8 +27,8 @@
#define PM1A_EVT_ADDRESS 0x1800UL #define PM1A_EVT_ADDRESS 0x1800UL
#define PM1A_EVT_ACCESS_SIZE 0x2U #define PM1A_EVT_ACCESS_SIZE 0x2U
#define PM1A_CNT_ADDRESS 0x1804UL #define PM1A_CNT_ADDRESS 0x1804UL
/* S3 is not supported by BIOS */
/* S3 is not supported by BIOS */
#undef S3_PKG_VAL_PM1A #undef S3_PKG_VAL_PM1A
#define S3_PKG_VAL_PM1A 0x0U #define S3_PKG_VAL_PM1A 0x0U