From a7354ab391fad180ae36ebfacd6db2aa1dee8595 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Wed, 29 Jul 2020 19:00:31 -0700 Subject: [PATCH] tests: xip: remove hack and add qemu_x86_xip We now have a variant x86 build target that only is run for tests tagged with "xip", which is this one. Signed-off-by: Andrew Boie --- boards/x86/qemu_x86/qemu_x86_xip.dts | 7 +++++++ boards/x86/qemu_x86/qemu_x86_xip.yaml | 12 ++++++++++++ boards/x86/qemu_x86/qemu_x86_xip_defconfig | 19 +++++++++++++++++++ tests/kernel/xip/testcase.yaml | 8 -------- 4 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 boards/x86/qemu_x86/qemu_x86_xip.dts create mode 100644 boards/x86/qemu_x86/qemu_x86_xip.yaml create mode 100644 boards/x86/qemu_x86/qemu_x86_xip_defconfig diff --git a/boards/x86/qemu_x86/qemu_x86_xip.dts b/boards/x86/qemu_x86/qemu_x86_xip.dts new file mode 100644 index 00000000000..707ded4ea88 --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_xip.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_xip.yaml b/boards/x86/qemu_x86/qemu_x86_xip.yaml new file mode 100644 index 00000000000..7fb1de7ac4b --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_xip.yaml @@ -0,0 +1,12 @@ +identifier: qemu_x86_xip +name: QEMU Emulation for X86 (XIP enabled) +type: qemu +arch: x86 +simulation: qemu +toolchain: + - zephyr + - xtools +testing: + default: true + only_tags: + - xip diff --git a/boards/x86/qemu_x86/qemu_x86_xip_defconfig b/boards/x86/qemu_x86/qemu_x86_xip_defconfig new file mode 100644 index 00000000000..4f47b5c6390 --- /dev/null +++ b/boards/x86/qemu_x86/qemu_x86_xip_defconfig @@ -0,0 +1,19 @@ +# 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_DEBUG_INFO=y +CONFIG_SCHED_SCALABLE=y +CONFIG_WAITQ_SCALABLE=y +CONFIG_X86_VERY_EARLY_CONSOLE=y +CONFIG_QEMU_ICOUNT_SHIFT=5 +CONFIG_XIP=y diff --git a/tests/kernel/xip/testcase.yaml b/tests/kernel/xip/testcase.yaml index ecc65d2e59e..abd8988daec 100644 --- a/tests/kernel/xip/testcase.yaml +++ b/tests/kernel/xip/testcase.yaml @@ -2,11 +2,3 @@ tests: arch.common.xip: filter: CONFIG_XIP tags: xip - - # Platforms where XIP is supported but not on by default (rare, typically - # emulator targets, to show that XIP is working for a particular arch) - arch.common.xip.nondefault: - platform_whitelist: qemu_x86 qemu_x86_coverage - extra_configs: - - CONFIG_XIP=y - tags: xip