From 39523f45c52db70e3194d1a7d28ef1a4fc04b6ba Mon Sep 17 00:00:00 2001 From: Lauren Murphy Date: Tue, 29 Sep 2020 19:59:57 -0500 Subject: [PATCH] boards: Add qemu_x86_64_nokpti target Adds a build target to run tests on qemu_x86_64 with KPTI disabled. Signed-off-by: Lauren Murphy --- boards/x86/qemu_x86/qemu_x86_64_nokpti.dts | 6 ++++++ boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml | 13 ++++++++++++ .../x86/qemu_x86/qemu_x86_64_nokpti_defconfig | 20 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 boards/x86/qemu_x86/qemu_x86_64_nokpti.dts create mode 100644 boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml create mode 100644 boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig diff --git a/boards/x86/qemu_x86/qemu_x86_64_nokpti.dts b/boards/x86/qemu_x86/qemu_x86_64_nokpti.dts new file mode 100644 index 00000000000..92522ab8a4e --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_64_nokpti.dts @@ -0,0 +1,6 @@ +/* + * Copyright (c) 2019 Intel Corp. + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "qemu_x86.dts" diff --git a/boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml b/boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml new file mode 100644 index 00000000000..49431fb4bf3 --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml @@ -0,0 +1,13 @@ +identifier: qemu_x86_64_nokpti +name: QEMU Emulation for X86_64 (KPTI disabled) +type: qemu +arch: x86 +toolchain: + - zephyr + - xtools +simulation: qemu +testing: + default: true + only_tags: + - kernel + - userspace diff --git a/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig b/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig new file mode 100644 index 00000000000..082f0427f7b --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_SOC_IA32=y +CONFIG_BOARD_QEMU_X86_64=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_DEBUG_INFO=y +CONFIG_SMP=y +CONFIG_MP_NUM_CPUS=2 +CONFIG_X86_MMU=y +CONFIG_X86_VERY_EARLY_CONSOLE=y +CONFIG_QEMU_ICOUNT=n +CONFIG_X86_KPTI=n