qemu: Creation of QEMU specific platforms

Setting up new platforms to handle emulation, and make them the only
ones able to run on QEMU from the Makefile "qemu" target to avoid
confusion with other platforms. We have now platform qemu_x86 and
platform qemu_cortex_m3, also modification to the sanity checks to have
qemu support only on those platforms

Signed-off-by: Sergio Rodriguez <sergio.sf.rodriguez@intel.com>
Change-Id: I9291918a1d58fea4f37750ada78234628f9a5d98
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

Makefile.inc

@@ -58,8 +58,13 @@ DOTCONFIG = $(O)/.config
 all: $(DOTCONFIG)
 	$(Q)$(call zephyrmake,$(O),$@)
 
+ifeq ($(findstring qemu_,$(PLATFORM_CONFIG)),)
+qemu:
+	@echo "Emulation not available for this platform"
+else
 qemu: $(DOTCONFIG)
 	$(Q)$(call zephyrmake,$(O),$@)
+endif
 
 initconfig: $(DOTCONFIG)
 

arch/arm/defconfig

@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
-CONFIG_PLATFORM_TI_LM3S6965=y
+CONFIG_PLATFORM_QEMU_ARM=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_0"

arch/arm/platforms/qemu_arm/Kconfig

@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-if PLATFORM_TI_LM3S6965
+if PLATFORM_QEMU_ARM
 config PLATFORM
 	string
-	default ti_lm3s6965
+	default qemu_arm
 	help
 	This option holds the directory name used by the build system to locate
 	the correct linker file.

arch/arm/platforms/qemu_arm/Kconfig.platform

@@ -0,0 +1,6 @@
+
+config  PLATFORM_QEMU_ARM
+	bool "QEMU for ARM"
+	select CPU_CORTEX_M
+	select CPU_CORTEX_M3
+

arch/arm/platforms/qemu_arm/board.h

@@ -1,4 +1,4 @@
-/* board.h - board configuration macros for the ti_lm3s6965 platform */
+/* board.h - board configuration macros for the QEMU for arm platform */
 
 /*
  * Copyright (c) 2013-2015 Wind River Systems, Inc.
@@ -19,7 +19,7 @@
 /*
  * DESCRIPTION
  * This header file is used to specify and describe board-level aspects for
- * the 'ti_lm3s6965' platform.
+ * the 'QEMU' platform.
  */
 
 #ifndef _BOARD__H_

arch/arm/platforms/ti_lm3s6965/Kconfig.platform

@@ -1,6 +0,0 @@
-
-config  PLATFORM_TI_LM3S6965
-	bool "TI LM3S6965"
-	select CPU_CORTEX_M
-	select CPU_CORTEX_M3
-

arch/x86/configs/qemu_x86_defconfig

@@ -0,0 +1,17 @@
+CONFIG_X86_32=y
+CONFIG_PLATFORM_QEMU_X86=y
+CONFIG_CPU_ATOM=y
+CONFIG_IA32_LEGACY_IO_PORTS=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_TIMER_IRQ=2
+CONFIG_HPET_TIMER_LEVEL_LOW=y
+CONFIG_HPET_TIMER_LEGACY_EMULATION=y
+CONFIG_HPET_TIMER_RISING_EDGE=y
+CONFIG_PIC_DISABLE=y
+CONFIG_LOAPIC=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_NS16550=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
+

arch/x86/platforms/qemu_x86/Kconfig

@@ -0,0 +1,139 @@
+#
+# Copyright (c) 2015 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if PLATFORM_QEMU_X86
+
+config PLATFORM
+	string
+	default qemu_x86
+	help
+	This option holds the directory name used by the build system to locate
+	the correct linker file.
+
+config PHYS_LOAD_ADDR
+	default 0x00100000
+
+config PHYS_RAM_ADDR
+	default 0x00400000
+
+config RAM_SIZE
+	default 128 if XIP
+	default 192
+
+config ROM_SIZE
+	default 72 if XIP
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 150000000 if LOAPIC_TIMER
+	default 25000000  if HPET_TIMER
+
+config KERNEL_INIT_PRIORITY_DEFAULT
+	default 40
+
+config KERNEL_INIT_PRIORITY_DEVICE
+	default 50
+
+config UART_CONSOLE_PRIORITY
+	default 60
+
+config IPI_CONSOLE_PRIORITY
+	default 60
+
+if UART_NS16550
+
+config UART_NS16550_PCI
+	def_bool n
+
+config UART_NS16550_PORT_0
+	def_bool y
+
+if UART_NS16550_PORT_0
+
+config UART_NS16550_PORT_0_NAME
+	default "UART_0"
+config UART_NS16550_PORT_0_BASE_ADDR
+	default 0x03F8
+config UART_NS16550_PORT_0_IRQ
+	default 4
+config UART_NS16550_PORT_0_IRQ_PRI
+	default 3
+config UART_NS16550_PORT_0_BAUD_RATE
+	default 115200
+config UART_NS16550_PORT_0_CLK_FREQ
+	default 1843200
+config UART_NS16550_PORT_0_OPTIONS
+	default 0
+
+endif # UART_NS16550_PORT_0
+
+config UART_NS16550_PORT_1
+	def_bool y
+
+if UART_NS16550_PORT_1
+
+config UART_NS16550_PORT_1_NAME
+	default "UART_1"
+config UART_NS16550_PORT_1_BASE_ADDR
+	default 0x02F8
+config UART_NS16550_PORT_1_IRQ
+	default 3
+config UART_NS16550_PORT_1_IRQ_PRI
+	default 3
+config UART_NS16550_PORT_1_BAUD_RATE
+	default 115200
+config UART_NS16550_PORT_1_CLK_FREQ
+	default 1843200
+config UART_NS16550_PORT_1_OPTIONS
+	default 0
+
+endif # UART_NS16550_PORT_1
+
+endif # UART_NS16550
+
+if UART_CONSOLE
+
+config UART_CONSOLE_ON_DEV_NAME
+	default "UART_0"
+config UART_CONSOLE_IRQ
+	default 4
+config UART_CONSOLE_IRQ_PRI
+	default 3
+
+endif
+
+if BLUETOOTH_UART
+
+config BLUETOOTH_UART_ON_DEV_NAME
+	default "UART_1"
+config BLUETOOTH_UART_IRQ
+	default 3
+config BLUETOOTH_UART_IRQ_PRI
+	default 3
+
+endif
+
+if UART_PIPE
+
+config UART_PIPE_ON_DEV_NAME
+	default "UART_1"
+config UART_PIPE_IRQ
+	default 3
+config UART_PIPE_IRQ_PRI
+	default 3
+
+endif
+
+endif

arch/x86/platforms/qemu_x86/Kconfig.platform

@@ -0,0 +1,5 @@
+
+
+config PLATFORM_QEMU_X86
+	bool "QEMU for x86"
+	select BOOTLOADER_UNKNOWN

arch/x86/platforms/qemu_x86/Makefile

@@ -0,0 +1,6 @@
+ccflags-y +=-I$(srctree)/arch/x86
+ccflags-y +=-I$(srctree)/include/drivers
+ccflags-y +=-I$(srctree)/drivers
+asflags-y := ${ccflags-y}
+
+obj-y += platform.o

arch/x86/platforms/qemu_x86/board.h

@@ -0,0 +1,122 @@
+/* board.h - board configuration macros for the QEMU platform */
+
+/*
+ * Copyright (c) 2010-2015, Wind River Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * DESCRIPTION
+ * This header file is used to specify and describe board-level aspects for
+ * the 'QEMU' platform.
+ */
+
+#ifndef __INCboardh
+#define __INCboardh
+
+#include <misc/util.h>
+
+#ifndef _ASMLANGUAGE
+#include <device.h>
+#include <drivers/rand32.h>
+#endif
+
+#ifdef CONFIG_IOAPIC
+#include <drivers/ioapic.h>
+#ifdef CONFIG_SERIAL_INTERRUPT_LEVEL
+#ifdef CONFIG_SERIAL_INTERRUPT_LOW
+#define UART_IRQ_FLAGS (IOAPIC_LEVEL | IOAPIC_LOW)
+#else
+#define UART_IRQ_FLAGS (IOAPIC_LEVEL)
+#endif
+#else /* edge triggered interrupt */
+#ifdef CONFIG_SERIAL_INTERRUPT_LOW
+/* generate interrupt on falling edge */
+#define UART_IRQ_FLAGS (IOAPIC_LOW)
+#else
+/* generate interrupt on raising edge */
+#define UART_IRQ_FLAGS (0)
+#endif
+#endif
+#endif
+
+#define INT_VEC_IRQ0 0x20 /* vector number for IRQ0 */
+
+/* serial port (aka COM port) information */
+
+#ifdef CONFIG_NS16550
+
+#define COM1_BASE_ADRS 0x3f8
+#define COM1_INT_LVL 0x04 /* COM1 connected to IRQ4 */
+#define COM1_INT_VEC (INT_VEC_IRQ0 + COM1_INT_LVL)
+#define COM1_INT_PRI 3
+#define COM1_BAUD_RATE 115200
+
+#define COM2_BASE_ADRS 0x2f8
+#define COM2_INT_LVL 0x03 /* COM2 connected to IRQ3 */
+#define COM2_INT_VEC (INT_VEC_IRQ0 + COM2_INT_LVL)
+#define COM2_INT_PRI 3
+#define COM2_BAUD_RATE 115200
+
+#define UART_REG_ADDR_INTERVAL 1 /* address diff of adjacent regs. */
+#define UART_XTAL_FREQ 1843200
+
+/* uart configuration settings */
+
+/* Generic definitions */
+#define CONFIG_UART_BAUDRATE		COM1_BAUD_RATE
+#define CONFIG_UART_PORT_0_REGS		COM1_BASE_ADRS
+#define CONFIG_UART_PORT_0_IRQ		COM1_INT_LVL
+#define CONFIG_UART_PORT_0_IRQ_PRIORITY	COM1_INT_PRI
+#define CONFIG_UART_PORT_1_REGS		COM2_BASE_ADRS
+#define CONFIG_UART_PORT_1_IRQ		COM2_INT_LVL
+#define CONFIG_UART_PORT_1_IRQ_PRIORITY	COM2_INT_PRI
+
+/* Pipe UART definitions */
+#define CONFIG_UART_PIPE_INDEX 1
+#define CONFIG_UART_PIPE_BAUDRATE CONFIG_UART_BAUDRATE
+#define CONFIG_UART_PIPE_IRQ COM2_INT_LVL
+#define CONFIG_UART_PIPE_INT_PRI COM2_INT_PRI
+#define CONFIG_UART_PIPE_FREQ UART_XTAL_FREQ
+
+#ifndef _ASMLANGUAGE
+extern struct device * const uart_devs[];
+#endif
+
+/* Console definitions */
+#if defined(CONFIG_UART_CONSOLE)
+
+#define CONFIG_UART_CONSOLE_IRQ		COM1_INT_LVL
+#define CONFIG_UART_CONSOLE_INT_PRI	COM1_INT_PRI
+
+#define UART_CONSOLE_DEV (uart_devs[CONFIG_UART_CONSOLE_INDEX])
+
+#endif /* CONFIG_UART_CONSOLE */
+
+/* Bluetooth UART definitions */
+#if defined(CONFIG_BLUETOOTH_UART)
+
+#define CONFIG_BLUETOOTH_UART_INDEX 1
+#define CONFIG_BLUETOOTH_UART_IRQ COM2_INT_LVL
+#define CONFIG_BLUETOOTH_UART_INT_PRI COM2_INT_PRI
+#define CONFIG_BLUETOOTH_UART_FREQ UART_XTAL_FREQ
+#define CONFIG_BLUETOOTH_UART_BAUDRATE CONFIG_UART_BAUDRATE
+
+#define BT_UART_DEV (uart_devs[CONFIG_BLUETOOTH_UART_INDEX])
+
+#endif /* CONFIG_BLUETOOTH_UART */
+
+#endif /* CONFIG_NS16550 */
+
+#endif /* __INCboardh */

arch/x86/platforms/qemu_x86/linker.cmd

@@ -0,0 +1,59 @@
+/* linker.cmd - Linker command/script file */
+
+/*
+ * Copyright (c) 2011-2014, Wind River Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+DESCRIPTION
+This is the linker script for both standard images and XIP images.
+ */
+
+#include <autoconf.h>
+
+/* physical address where the kernel is loaded */
+#define PHYS_LOAD_ADDR CONFIG_PHYS_LOAD_ADDR
+
+/* physical address of RAM */
+#ifdef CONFIG_XIP
+  #define PHYS_RAM_ADDR    CONFIG_PHYS_RAM_ADDR
+#else  /* !CONFIG_XIP */
+  #define PHYS_RAM_ADDR    PHYS_LOAD_ADDR
+#endif /* CONFIG_XIP */
+
+MEMORY
+    {
+#ifdef CONFIG_XIP
+    ROM (rx)        : ORIGIN = PHYS_LOAD_ADDR, LENGTH = CONFIG_ROM_SIZE*1K
+    RAM (wx)        : ORIGIN = PHYS_RAM_ADDR, LENGTH = CONFIG_RAM_SIZE*1K
+#else  /* !CONFIG_XIP */
+    RAM (wx)	    : ORIGIN = PHYS_LOAD_ADDR, LENGTH = CONFIG_RAM_SIZE*1K
+#endif /* CONFIG_XIP */
+
+    /*
+     * It doesn't matter where this region goes as it is stripped from the
+     * final ELF image. The address doesn't even have to be valid on the
+     * target. However, it shouldn't overlap any other regions.
+     */
+
+    IDT_LIST        : ORIGIN = 2K, LENGTH = 2K
+    }
+
+#include <arch/x86/linker-common-sections.h>
+
+/* start adding platform specific linker sections here */
+
+/* no sections should appear after linker-epilog.h */
+#include <arch/x86/linker-epilog.h>

arch/x86/platforms/qemu_x86/platform.c

@@ -0,0 +1,77 @@
+/* ia32.c - system/hardware module for the QEMU platform */
+
+/*
+ * Copyright (c) 2011-2015, Wind River Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * DESCRIPTION
+ * This module provides routines to initialize and support board-level hardware
+ * for the QEMU platform.
+ */
+
+#include <nanokernel.h>
+#include "board.h"
+#include <uart.h>
+#include <drivers/pic.h>
+#include <device.h>
+#include <init.h>
+#include <loapic.h>
+#include <drivers/ioapic.h>
+#include <drivers/hpet.h>
+
+
+
+/**
+ *
+ * @brief Perform basic hardware initialization
+ *
+ * Initialize the interrupt controller and UARTs present in the
+ * platform.
+ *
+ * @return 0
+ */
+static int qemu_x86_init(struct device *arg)
+{
+	ARG_UNUSED(arg);
+
+	return 0;
+}
+
+#ifdef CONFIG_IOAPIC
+DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL);
+SYS_DEFINE_DEVICE(ioapic_0, NULL, PRIMARY,
+		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+
+#endif /* CONFIG_IOAPIC */
+
+#ifdef CONFIG_LOAPIC
+DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL);
+SYS_DEFINE_DEVICE(loapic_0, NULL, PRIMARY,
+		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+
+#endif /* CONFIG_LOAPIC */
+
+#if defined(CONFIG_PIC_DISABLE)
+
+DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL);
+SYS_DEFINE_DEVICE(pic_0, NULL, PRIMARY,
+		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+
+#endif /* CONFIG_PIC_DISABLE */
+
+DECLARE_DEVICE_INIT_CONFIG(qemu_x86_0, "", qemu_x86_init, NULL);
+SYS_DEFINE_DEVICE(qemu_x86_0, NULL, SECONDARY,
+		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

configs/basic_cortex_m3_defconfig

@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
-CONFIG_PLATFORM_TI_LM3S6965=y
+CONFIG_PLATFORM_QEMU_ARM=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

configs/qemu_cortex_m3_defconfig

@@ -0,0 +1,12 @@
+CONFIG_ARM=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
+CONFIG_PLATFORM_QEMU_ARM=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_CONSOLE_INDEX=0
+CONFIG_UART_CONSOLE_BAUDRATE=115200
+CONFIG_SERIAL=y
+CONFIG_CORTEX_M_SYSTICK=y
+CONFIG_FLASH_SIZE=256
+CONFIG_SRAM_SIZE=64
+CONFIG_UART_STELLARIS=y

configs/qemu_x86_defconfig

@@ -0,0 +1,17 @@
+CONFIG_X86=y
+CONFIG_PLATFORM_QEMU_X86=y
+CONFIG_CPU_MINUTEIA=y
+CONFIG_IA32_LEGACY_IO_PORTS=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_TIMER_IRQ=2
+CONFIG_HPET_TIMER_LEVEL_LOW=y
+CONFIG_HPET_TIMER_LEGACY_EMULATION=y
+CONFIG_HPET_TIMER_RISING_EDGE=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_UART_NS16550_ACCESS_IOPORT=y

doc/application/apps_structure.rst

@@ -161,7 +161,7 @@ Example Makefile
 .. code-block:: make
 
    KERNEL_TYPE = micro
-   PLATFORM_CONFIG ?= basic_atom
+   PLATFORM_CONFIG ?= qemu_x86
    CONF_FILE = prj.conf
    MDEF_FILE = prj.mdef
    include ${ZEPHYR_BASE}/Makefile.inc

doc/quick_start/application.rst

@@ -69,13 +69,13 @@ To run an application using the x86 basic_atom platform configuration, type:
 
 .. code-block:: console
 
-   $ make PLATFORM_CONFIG=basic_atom qemu
+   $ make PLATFORM_CONFIG=qemu_x86 qemu
 
 To run an application using the ARM basic_cortex_m3 platform configuration, type:
 
 .. code-block:: console
 
-   $ make PLATFORM_CONFIG=basic_cortex_m3 ARCH=arm qemu
+   $ make PLATFORM_CONFIG=qemu_cortex_m3 ARCH=arm qemu
 
 Qemu is not supported on all platforms and architectures and some samples and
 test cases might fail when running in the emulator. When developing for a

samples/bluetooth/beacon/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/bluetooth/central/Makefile

@@ -18,7 +18,7 @@
 
 # DESCRIPTION
 # Makefile for the Bluetooth LE central role sample
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/bluetooth/init/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/bluetooth/peripheral/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/bluetooth/shell/Makefile

@@ -18,7 +18,7 @@
 
 # DESCRIPTION
 # Makefile for the console shell with Bluetooth commands
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/bluetooth/tester/Makefile

@@ -18,8 +18,8 @@
 
 # DESCRIPTION
 # Makefile for the Bluetooth tester application
-# default for basic_cortex_m3 as only this currently supports enought UARTs
+# default for qemu_cortex_m3 as only this currently supports enought UARTs
-PLATFORM_CONFIG ?= basic_cortex_m3
+PLATFORM_CONFIG ?= qemu_cortex_m3
 ARCH ?= arm
 
 MDEF_FILE = prj.mdef

samples/microkernel/apps/hello_world/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/apps/kernel_event_logger/Makefile

@@ -1,7 +1,7 @@
 BSP ?= generic_pc
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/apps/net/echo_client/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_client/src/
 

samples/microkernel/apps/net/echo_server/Makefile

@@ -19,7 +19,7 @@
 NET_INTF ?= slip
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH)_$(NET_INTF).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock

samples/microkernel/apps/net/listener/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/listener/src/
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock

samples/microkernel/apps/net/test/test_15_4/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
 

samples/microkernel/apps/net/test_15_4/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
 

samples/microkernel/apps/nfc_hello/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE ?= nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/nfc_hello/src/
 

samples/microkernel/apps/philosophers/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/benchmark/app_kernel/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj.conf

samples/microkernel/benchmark/boot_time/Makefile

@@ -1,12 +1,13 @@
-CONF_basic_minuteia = ia32/prj.conf
+CONF_basic_minuteia 	= ia32/prj.conf
-CONF_quark_d2000    = quark_d2000/quark_d2000_prj.conf
+CONF_quark_d2000    	= quark_d2000/quark_d2000_prj.conf
-CONF_quark_se   = quark_se/quark_se_prj.conf
+CONF_quark_se   	= quark_se/quark_se_prj.conf
-CONF_basic_atom     = ia32/prj_expert_test.conf
+CONF_qemu_x86     	= ia32/prj_expert_test.conf
-CONF_galileo        = ia32_pci/prj.conf
+CONF_basic_atom     	= ia32/prj_expert_test.conf
+CONF_galileo        	= ia32_pci/prj.conf
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = ${CONF_${PLATFORM_CONFIG}}
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/benchmark/footprint/Makefile

@@ -1,6 +1,6 @@
 # default configuration
 TEST ?= min
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 
 MDEF_FILE = micro_${TEST}.mdef
 KERNEL_TYPE = micro

samples/microkernel/benchmark/latency_measure/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/benchmark/sys_kernel/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/nanokernel/benchmark/sys_kernel/src/
 

samples/microkernel/test/test_aes/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/microkernel/test/test_bluetooth/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/test_bluetooth/
 

samples/microkernel/test/test_cbc/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/microkernel/test/test_critical/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_ctr/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/microkernel/test/test_events/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 
 CONF_FILE = prj_$(ARCH).conf
 

samples/microkernel/test/test_fifo/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_fifo_priv/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR := $(ZEPHYR_BASE)/samples/microkernel/test/test_fifo/src
 # Enable testing for private microkernel FIFOs

samples/microkernel/test/test_fp_sharing/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_hmac/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/microkernel/test/test_libs/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_mail/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_mail_priv/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR := $(ZEPHYR_BASE)/samples/microkernel/test/test_mail/src
 

samples/microkernel/test/test_map/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_map_priv/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR := $(ZEPHYR_BASE)/samples/microkernel/test/test_map/src
 

samples/microkernel/test/test_mutex/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_pipe/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_pipe_priv/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR := $(ZEPHYR_BASE)/samples/microkernel/test/test_pipe/src
 

samples/microkernel/test/test_pool/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_prng/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/microkernel/test/test_rand32/Makefile

@@ -17,7 +17,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_sema/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_sema_priv/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR := $(ZEPHYR_BASE)/samples/microkernel/test/test_sema/src
 

samples/microkernel/test/test_sha256/Makefile

@@ -1,4 +1,4 @@
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf

samples/microkernel/test/test_sprintf/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_stackprot/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_static_idt/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_task/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_task_irq/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_task_priv/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR := $(ZEPHYR_BASE)/samples/microkernel/test/test_task/src
 

samples/microkernel/test/test_tickless/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_timer/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/microkernel/test/test_xip/Makefile

@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 
 include ${ZEPHYR_BASE}/Makefile.inc

samples/nanokernel/apps/bluetooth/init/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/init/src/
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr

samples/nanokernel/apps/bluetooth/shell/Makefile

@@ -19,7 +19,7 @@
 # DESCRIPTION
 # Makefile for the Bluetooth init sample
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/shell/src/

samples/nanokernel/apps/hello_world/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/hello_world/src/
 CONF_FILE = prj.conf
 

samples/nanokernel/apps/kernel_event_logger/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/kernel_event_logger/src/
 CONF_FILE = prj_$(ARCH).conf
 

samples/nanokernel/apps/net/echo_server/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock

samples/nanokernel/apps/net/listener/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/listener/src/
 

samples/nanokernel/apps/net/loopback_test/Makefile

@@ -18,7 +18,7 @@
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/loopback_test/src/
 

samples/nanokernel/apps/philosophers/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/apps/philosophers/src/
 CONF_FILE = prj_$(ARCH).conf
 

samples/nanokernel/apps/shell/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG = basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/benchmark/boot_time/Makefile

@@ -1,11 +1,12 @@
 CONF_basic_minuteia = ia32/prj.conf
 CONF_quark_d2000    = quark_d2000/quark_d2000_prj.conf
 CONF_quark_se  	    = quark_se/quark_se_prj.conf
-CONF_basic_atom     = ia32/prj_expert_test.conf
+CONF_qemu_x86       = ia32/prj_expert_test.conf
 CONF_galileo        = ia32_pci/prj.conf
+CONF_basic_atom     = ia32/prj_expert_test.conf
 
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = $(CONF_$(PLATFORM_CONFIG))
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/benchmark/boot_time/src/
 

samples/nanokernel/benchmark/footprint/Makefile

@@ -2,7 +2,7 @@
 TEST ?= min
 
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = $(or $(wildcard prj_$(TEST)_$(ARCH)_$(PLATFORM_CONFIG).conf), \
                  $(wildcard prj_$(TEST)_$(ARCH).conf))
 CFLAGS += -DTEST_$(TEST)

samples/nanokernel/benchmark/latency_measure/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/benchmark/latency_measure/src/
 

samples/nanokernel/benchmark/sys_kernel/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_console.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/test/test_atomic/Makefile

@@ -1,4 +1,4 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/test/test_bluetooth/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/bluetooth/test_bluetooth/
 

samples/nanokernel/test/test_context/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/test/test_fifo/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/test/test_fp_sharing/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/microkernel/test/test_fp_sharing/src/
 

samples/nanokernel/test/test_ipi/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/test/test_lifo/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
 include $(ZEPHYR_BASE)/Makefile.inc

samples/nanokernel/test/test_mem_safe/Makefile

@@ -1,5 +1,5 @@
 KERNEL_TYPE = nano
-PLATFORM_CONFIG ?= basic_atom
+PLATFORM_CONFIG ?= qemu_x86
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc