From 67395d6f0767984e8f1df4126a2ed562dc3844d0 Mon Sep 17 00:00:00 2001 From: Lauren Murphy Date: Tue, 29 Sep 2020 19:55:51 -0500 Subject: [PATCH] boards: Add qemu_x86_nokpti target Adds a build target to run tests on qemu_x86 with KPTI disabled. Signed-off-by: Lauren Murphy --- boards/x86/qemu_x86/qemu_x86_nokpti.dts | 7 +++++++ boards/x86/qemu_x86/qemu_x86_nokpti.yaml | 13 ++++++++++++ boards/x86/qemu_x86/qemu_x86_nokpti_defconfig | 21 +++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 boards/x86/qemu_x86/qemu_x86_nokpti.dts create mode 100644 boards/x86/qemu_x86/qemu_x86_nokpti.yaml create mode 100644 boards/x86/qemu_x86/qemu_x86_nokpti_defconfig diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti.dts b/boards/x86/qemu_x86/qemu_x86_nokpti.dts new file mode 100644 index 00000000000..707ded4ea88 --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_nokpti.dts @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2020 Intel Corporation + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "qemu_x86.dts" diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti.yaml b/boards/x86/qemu_x86/qemu_x86_nokpti.yaml new file mode 100644 index 00000000000..6d1d7764a83 --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_nokpti.yaml @@ -0,0 +1,13 @@ +identifier: qemu_x86_nokpti +name: QEMU Emulation for X86 (KPTI disabled) +type: qemu +arch: x86 +simulation: qemu +toolchain: + - zephyr + - xtools +testing: + default: true + only_tags: + - kernel + - userspace diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig b/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig new file mode 100644 index 00000000000..5a30c03301f --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_SOC_IA32=y +CONFIG_BOARD_QEMU_X86=y +CONFIG_HPET_TIMER=y +CONFIG_PIC_DISABLE=y +CONFIG_LOAPIC=y +CONFIG_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_UART_NS16550=y +CONFIG_UART_CONSOLE=y +CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 +CONFIG_TEST_RANDOM_GENERATOR=y +CONFIG_X86_MMU=y +CONFIG_X86_MMU_PAGE_POOL_PAGES=15 +CONFIG_DEBUG_INFO=y +CONFIG_SCHED_SCALABLE=y +CONFIG_WAITQ_SCALABLE=y +CONFIG_X86_VERY_EARLY_CONSOLE=y +CONFIG_QEMU_ICOUNT_SHIFT=5 +CONFIG_X86_KPTI=n