diff --git a/Makefile.inc b/Makefile.inc index 963eddfcc45..1b36b25919e 100644 --- a/Makefile.inc +++ b/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) diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 6a41599777e..5b5ce6b72cd 100644 --- a/arch/arm/defconfig +++ b/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" diff --git a/arch/arm/platforms/ti_lm3s6965/Kconfig b/arch/arm/platforms/qemu_arm/Kconfig similarity index 98% rename from arch/arm/platforms/ti_lm3s6965/Kconfig rename to arch/arm/platforms/qemu_arm/Kconfig index f561b164037..bd86285d375 100644 --- a/arch/arm/platforms/ti_lm3s6965/Kconfig +++ b/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. diff --git a/arch/arm/platforms/qemu_arm/Kconfig.platform b/arch/arm/platforms/qemu_arm/Kconfig.platform new file mode 100644 index 00000000000..aec976a515b --- /dev/null +++ b/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 + diff --git a/arch/arm/platforms/ti_lm3s6965/Makefile b/arch/arm/platforms/qemu_arm/Makefile similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/Makefile rename to arch/arm/platforms/qemu_arm/Makefile diff --git a/arch/arm/platforms/ti_lm3s6965/board.h b/arch/arm/platforms/qemu_arm/board.h similarity index 95% rename from arch/arm/platforms/ti_lm3s6965/board.h rename to arch/arm/platforms/qemu_arm/board.h index 2e6a7a70701..33e44f15be2 100644 --- a/arch/arm/platforms/ti_lm3s6965/board.h +++ b/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_ diff --git a/arch/arm/platforms/ti_lm3s6965/irq_vector_table.c b/arch/arm/platforms/qemu_arm/irq_vector_table.c similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/irq_vector_table.c rename to arch/arm/platforms/qemu_arm/irq_vector_table.c diff --git a/arch/arm/platforms/ti_lm3s6965/linker.cmd b/arch/arm/platforms/qemu_arm/linker.cmd similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/linker.cmd rename to arch/arm/platforms/qemu_arm/linker.cmd diff --git a/arch/arm/platforms/ti_lm3s6965/nmi_on_reset.S b/arch/arm/platforms/qemu_arm/nmi_on_reset.S similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/nmi_on_reset.S rename to arch/arm/platforms/qemu_arm/nmi_on_reset.S diff --git a/arch/arm/platforms/ti_lm3s6965/platform_config.c b/arch/arm/platforms/qemu_arm/platform_config.c similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/platform_config.c rename to arch/arm/platforms/qemu_arm/platform_config.c diff --git a/arch/arm/platforms/ti_lm3s6965/scp.c b/arch/arm/platforms/qemu_arm/scp.c similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/scp.c rename to arch/arm/platforms/qemu_arm/scp.c diff --git a/arch/arm/platforms/ti_lm3s6965/scp.h b/arch/arm/platforms/qemu_arm/scp.h similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/scp.h rename to arch/arm/platforms/qemu_arm/scp.h diff --git a/arch/arm/platforms/ti_lm3s6965/system.c b/arch/arm/platforms/qemu_arm/system.c similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/system.c rename to arch/arm/platforms/qemu_arm/system.c diff --git a/arch/arm/platforms/ti_lm3s6965/Kconfig.platform b/arch/arm/platforms/ti_lm3s6965/Kconfig.platform deleted file mode 100644 index 6fe554addce..00000000000 --- a/arch/arm/platforms/ti_lm3s6965/Kconfig.platform +++ /dev/null @@ -1,6 +0,0 @@ - -config PLATFORM_TI_LM3S6965 - bool "TI LM3S6965" - select CPU_CORTEX_M - select CPU_CORTEX_M3 - diff --git a/arch/x86/configs/qemu_x86_defconfig b/arch/x86/configs/qemu_x86_defconfig new file mode 100644 index 00000000000..5cb22bdc826 --- /dev/null +++ b/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 + diff --git a/arch/x86/platforms/qemu_x86/Kconfig b/arch/x86/platforms/qemu_x86/Kconfig new file mode 100644 index 00000000000..0a52a199f6e --- /dev/null +++ b/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 diff --git a/arch/x86/platforms/qemu_x86/Kconfig.platform b/arch/x86/platforms/qemu_x86/Kconfig.platform new file mode 100644 index 00000000000..9f9243d915f --- /dev/null +++ b/arch/x86/platforms/qemu_x86/Kconfig.platform @@ -0,0 +1,5 @@ + + +config PLATFORM_QEMU_X86 + bool "QEMU for x86" + select BOOTLOADER_UNKNOWN diff --git a/arch/x86/platforms/qemu_x86/Makefile b/arch/x86/platforms/qemu_x86/Makefile new file mode 100644 index 00000000000..c167e02f4e1 --- /dev/null +++ b/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 diff --git a/arch/x86/platforms/qemu_x86/board.h b/arch/x86/platforms/qemu_x86/board.h new file mode 100644 index 00000000000..da225627e50 --- /dev/null +++ b/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 + +#ifndef _ASMLANGUAGE +#include +#include +#endif + +#ifdef CONFIG_IOAPIC +#include +#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 */ diff --git a/arch/x86/platforms/qemu_x86/linker.cmd b/arch/x86/platforms/qemu_x86/linker.cmd new file mode 100644 index 00000000000..c1ff1e81709 --- /dev/null +++ b/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 + +/* 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 + +/* start adding platform specific linker sections here */ + +/* no sections should appear after linker-epilog.h */ +#include diff --git a/arch/x86/platforms/qemu_x86/platform.c b/arch/x86/platforms/qemu_x86/platform.c new file mode 100644 index 00000000000..826972ebaa0 --- /dev/null +++ b/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 +#include "board.h" +#include +#include +#include +#include +#include +#include +#include + + + +/** + * + * @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); diff --git a/configs/basic_cortex_m3_defconfig b/configs/basic_cortex_m3_defconfig index 067cf1f21f6..8ddbe1ae186 100644 --- a/configs/basic_cortex_m3_defconfig +++ b/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 diff --git a/configs/qemu_cortex_m3_defconfig b/configs/qemu_cortex_m3_defconfig new file mode 100644 index 00000000000..f920443ca27 --- /dev/null +++ b/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 diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig new file mode 100644 index 00000000000..732449419e4 --- /dev/null +++ b/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 diff --git a/doc/application/apps_structure.rst b/doc/application/apps_structure.rst index 3a3f4b7e2bd..43b8ab186ee 100644 --- a/doc/application/apps_structure.rst +++ b/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 diff --git a/doc/quick_start/application.rst b/doc/quick_start/application.rst index 17cd93e1494..0c7925674a5 100644 --- a/doc/quick_start/application.rst +++ b/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 diff --git a/samples/bluetooth/beacon/Makefile b/samples/bluetooth/beacon/Makefile index 685182f8f9e..19a3b3694df 100644 --- a/samples/bluetooth/beacon/Makefile +++ b/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 diff --git a/samples/bluetooth/central/Makefile b/samples/bluetooth/central/Makefile index a3cbb20431b..26962d34683 100644 --- a/samples/bluetooth/central/Makefile +++ b/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 diff --git a/samples/bluetooth/init/Makefile b/samples/bluetooth/init/Makefile index 685182f8f9e..19a3b3694df 100644 --- a/samples/bluetooth/init/Makefile +++ b/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 diff --git a/samples/bluetooth/peripheral/Makefile b/samples/bluetooth/peripheral/Makefile index 685182f8f9e..19a3b3694df 100644 --- a/samples/bluetooth/peripheral/Makefile +++ b/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 diff --git a/samples/bluetooth/shell/Makefile b/samples/bluetooth/shell/Makefile index ca7b7b8aa92..068af0a5745 100644 --- a/samples/bluetooth/shell/Makefile +++ b/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 diff --git a/samples/bluetooth/tester/Makefile b/samples/bluetooth/tester/Makefile index 2c3826c0234..2c9d80424b0 100644 --- a/samples/bluetooth/tester/Makefile +++ b/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 -PLATFORM_CONFIG ?= basic_cortex_m3 +# default for qemu_cortex_m3 as only this currently supports enought UARTs +PLATFORM_CONFIG ?= qemu_cortex_m3 ARCH ?= arm MDEF_FILE = prj.mdef diff --git a/samples/microkernel/apps/hello_world/Makefile b/samples/microkernel/apps/hello_world/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/apps/hello_world/Makefile +++ b/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 diff --git a/samples/microkernel/apps/kernel_event_logger/Makefile b/samples/microkernel/apps/kernel_event_logger/Makefile index 6be75e81081..918160f8bcb 100644 --- a/samples/microkernel/apps/kernel_event_logger/Makefile +++ b/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 diff --git a/samples/microkernel/apps/net/echo_client/Makefile b/samples/microkernel/apps/net/echo_client/Makefile index 2bb06fd5f35..4c3b16033c9 100644 --- a/samples/microkernel/apps/net/echo_client/Makefile +++ b/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/ diff --git a/samples/microkernel/apps/net/echo_server/Makefile b/samples/microkernel/apps/net/echo_server/Makefile index 52873d9c501..6e6e9b9aec9 100644 --- a/samples/microkernel/apps/net/echo_server/Makefile +++ b/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 diff --git a/samples/microkernel/apps/net/listener/Makefile b/samples/microkernel/apps/net/listener/Makefile index 65cf0a81c0a..2fbe1e5f890 100644 --- a/samples/microkernel/apps/net/listener/Makefile +++ b/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 diff --git a/samples/microkernel/apps/net/test/test_15_4/Makefile b/samples/microkernel/apps/net/test/test_15_4/Makefile index 29cbfc09d33..080b2342016 100644 --- a/samples/microkernel/apps/net/test/test_15_4/Makefile +++ b/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/ diff --git a/samples/microkernel/apps/net/test_15_4/Makefile b/samples/microkernel/apps/net/test_15_4/Makefile index 6dfdd0350a0..2bdc75a0d07 100644 --- a/samples/microkernel/apps/net/test_15_4/Makefile +++ b/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/ diff --git a/samples/microkernel/apps/nfc_hello/Makefile b/samples/microkernel/apps/nfc_hello/Makefile index b1981c58f85..d38cabf3735 100644 --- a/samples/microkernel/apps/nfc_hello/Makefile +++ b/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/ diff --git a/samples/microkernel/apps/philosophers/Makefile b/samples/microkernel/apps/philosophers/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/apps/philosophers/Makefile +++ b/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 diff --git a/samples/microkernel/benchmark/app_kernel/Makefile b/samples/microkernel/benchmark/app_kernel/Makefile index a54a035440f..c1646f700f9 100644 --- a/samples/microkernel/benchmark/app_kernel/Makefile +++ b/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 diff --git a/samples/microkernel/benchmark/boot_time/Makefile b/samples/microkernel/benchmark/boot_time/Makefile index 20dda286bfc..8f645bc4c4d 100644 --- a/samples/microkernel/benchmark/boot_time/Makefile +++ b/samples/microkernel/benchmark/boot_time/Makefile @@ -1,12 +1,13 @@ -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_galileo = ia32_pci/prj.conf +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_qemu_x86 = ia32/prj_expert_test.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 diff --git a/samples/microkernel/benchmark/footprint/Makefile b/samples/microkernel/benchmark/footprint/Makefile index 7b8c007547a..83806da24f1 100644 --- a/samples/microkernel/benchmark/footprint/Makefile +++ b/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 diff --git a/samples/microkernel/benchmark/latency_measure/Makefile b/samples/microkernel/benchmark/latency_measure/Makefile index bf1eaed1412..9531dd7b5db 100644 --- a/samples/microkernel/benchmark/latency_measure/Makefile +++ b/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 diff --git a/samples/microkernel/benchmark/sys_kernel/Makefile b/samples/microkernel/benchmark/sys_kernel/Makefile index dab506f63f7..bc6f82bbebd 100644 --- a/samples/microkernel/benchmark/sys_kernel/Makefile +++ b/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/ diff --git a/samples/microkernel/test/test_aes/Makefile b/samples/microkernel/test/test_aes/Makefile index 92ecaed18cb..b06d0b6d29a 100644 --- a/samples/microkernel/test/test_aes/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_bluetooth/Makefile b/samples/microkernel/test/test_bluetooth/Makefile index c2b88354a0f..10a15b97f45 100644 --- a/samples/microkernel/test/test_bluetooth/Makefile +++ b/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/ diff --git a/samples/microkernel/test/test_cbc/Makefile b/samples/microkernel/test/test_cbc/Makefile index e8e1349afe4..cfc338780bd 100644 --- a/samples/microkernel/test/test_cbc/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_critical/Makefile b/samples/microkernel/test/test_critical/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_critical/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_ctr/Makefile b/samples/microkernel/test/test_ctr/Makefile index 3026b3f760e..9c7cfba52ca 100644 --- a/samples/microkernel/test/test_ctr/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_events/Makefile b/samples/microkernel/test/test_events/Makefile index 2638f902597..f998586bfc2 100644 --- a/samples/microkernel/test/test_events/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_fifo/Makefile b/samples/microkernel/test/test_fifo/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_fifo/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_fifo_priv/Makefile b/samples/microkernel/test/test_fifo_priv/Makefile index 8deadf5a428..5fe13e21326 100644 --- a/samples/microkernel/test/test_fifo_priv/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_fp_sharing/Makefile b/samples/microkernel/test/test_fp_sharing/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_fp_sharing/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_hmac/Makefile b/samples/microkernel/test/test_hmac/Makefile index 6ee6479291b..78cb010f357 100644 --- a/samples/microkernel/test/test_hmac/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_libs/Makefile b/samples/microkernel/test/test_libs/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_libs/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_mail/Makefile b/samples/microkernel/test/test_mail/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_mail/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_mail_priv/Makefile b/samples/microkernel/test/test_mail_priv/Makefile index 0ecf77add98..a82eb14cd90 100644 --- a/samples/microkernel/test/test_mail_priv/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_map/Makefile b/samples/microkernel/test/test_map/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_map/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_map_priv/Makefile b/samples/microkernel/test/test_map_priv/Makefile index cd314dc77fa..705ebca95c6 100644 --- a/samples/microkernel/test/test_map_priv/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_mutex/Makefile b/samples/microkernel/test/test_mutex/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_mutex/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_pipe/Makefile b/samples/microkernel/test/test_pipe/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_pipe/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_pipe_priv/Makefile b/samples/microkernel/test/test_pipe_priv/Makefile index 71e59201c8e..077355f6a8e 100644 --- a/samples/microkernel/test/test_pipe_priv/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_pool/Makefile b/samples/microkernel/test/test_pool/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_pool/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_prng/Makefile b/samples/microkernel/test/test_prng/Makefile index 6565b5d2604..69c5dc5bf4d 100644 --- a/samples/microkernel/test/test_prng/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_rand32/Makefile b/samples/microkernel/test/test_rand32/Makefile index 21ec79cc5e8..3c9f03d51ae 100644 --- a/samples/microkernel/test/test_rand32/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_sema/Makefile b/samples/microkernel/test/test_sema/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_sema/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_sema_priv/Makefile b/samples/microkernel/test/test_sema_priv/Makefile index 22ebbe80623..545ea0bd742 100644 --- a/samples/microkernel/test/test_sema_priv/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_sha256/Makefile b/samples/microkernel/test/test_sha256/Makefile index 423cb091460..ecd463c9b24 100644 --- a/samples/microkernel/test/test_sha256/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_sprintf/Makefile b/samples/microkernel/test/test_sprintf/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_sprintf/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_stackprot/Makefile b/samples/microkernel/test/test_stackprot/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_stackprot/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_static_idt/Makefile b/samples/microkernel/test/test_static_idt/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_static_idt/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_task/Makefile b/samples/microkernel/test/test_task/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_task/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_task_irq/Makefile b/samples/microkernel/test/test_task_irq/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_task_irq/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_task_priv/Makefile b/samples/microkernel/test/test_task_priv/Makefile index e8f3717edb4..a8255b761c2 100644 --- a/samples/microkernel/test/test_task_priv/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_tickless/Makefile b/samples/microkernel/test/test_tickless/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_tickless/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_timer/Makefile b/samples/microkernel/test/test_timer/Makefile index 824b54045f6..5132ca5f656 100644 --- a/samples/microkernel/test/test_timer/Makefile +++ b/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 diff --git a/samples/microkernel/test/test_xip/Makefile b/samples/microkernel/test/test_xip/Makefile index bf1eaed1412..9531dd7b5db 100644 --- a/samples/microkernel/test/test_xip/Makefile +++ b/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 diff --git a/samples/nanokernel/apps/bluetooth/init/Makefile b/samples/nanokernel/apps/bluetooth/init/Makefile index ccefe26782f..bb772108ac0 100644 --- a/samples/nanokernel/apps/bluetooth/init/Makefile +++ b/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 diff --git a/samples/nanokernel/apps/bluetooth/shell/Makefile b/samples/nanokernel/apps/bluetooth/shell/Makefile index 660d8f9ed1f..3d0448953f6 100644 --- a/samples/nanokernel/apps/bluetooth/shell/Makefile +++ b/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/ diff --git a/samples/nanokernel/apps/hello_world/Makefile b/samples/nanokernel/apps/hello_world/Makefile index 2be7773711b..2b9f66e3c08 100644 --- a/samples/nanokernel/apps/hello_world/Makefile +++ b/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 diff --git a/samples/nanokernel/apps/kernel_event_logger/Makefile b/samples/nanokernel/apps/kernel_event_logger/Makefile index 290fdf2c162..d361c9ce0b4 100644 --- a/samples/nanokernel/apps/kernel_event_logger/Makefile +++ b/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 diff --git a/samples/nanokernel/apps/net/echo_server/Makefile b/samples/nanokernel/apps/net/echo_server/Makefile index 0b3736dfd15..da47041e85c 100644 --- a/samples/nanokernel/apps/net/echo_server/Makefile +++ b/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 diff --git a/samples/nanokernel/apps/net/listener/Makefile b/samples/nanokernel/apps/net/listener/Makefile index 0d073e14995..271d8e5cfcc 100644 --- a/samples/nanokernel/apps/net/listener/Makefile +++ b/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/ diff --git a/samples/nanokernel/apps/net/loopback_test/Makefile b/samples/nanokernel/apps/net/loopback_test/Makefile index 792caf4a78a..02d451aa868 100644 --- a/samples/nanokernel/apps/net/loopback_test/Makefile +++ b/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/ diff --git a/samples/nanokernel/apps/philosophers/Makefile b/samples/nanokernel/apps/philosophers/Makefile index 068cfd46621..6b0443a670c 100644 --- a/samples/nanokernel/apps/philosophers/Makefile +++ b/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 diff --git a/samples/nanokernel/apps/shell/Makefile b/samples/nanokernel/apps/shell/Makefile index d724a7f9056..d9cdb727cb1 100644 --- a/samples/nanokernel/apps/shell/Makefile +++ b/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 diff --git a/samples/nanokernel/benchmark/boot_time/Makefile b/samples/nanokernel/benchmark/boot_time/Makefile index 76575e95200..42ad6456d16 100644 --- a/samples/nanokernel/benchmark/boot_time/Makefile +++ b/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/ diff --git a/samples/nanokernel/benchmark/footprint/Makefile b/samples/nanokernel/benchmark/footprint/Makefile index 0b4fea28d66..6e238e07779 100644 --- a/samples/nanokernel/benchmark/footprint/Makefile +++ b/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) diff --git a/samples/nanokernel/benchmark/latency_measure/Makefile b/samples/nanokernel/benchmark/latency_measure/Makefile index ae74489b0f5..abfdc064c7a 100644 --- a/samples/nanokernel/benchmark/latency_measure/Makefile +++ b/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/ diff --git a/samples/nanokernel/benchmark/sys_kernel/Makefile b/samples/nanokernel/benchmark/sys_kernel/Makefile index d891681ccf3..6956daf0028 100644 --- a/samples/nanokernel/benchmark/sys_kernel/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_atomic/Makefile b/samples/nanokernel/test/test_atomic/Makefile index 31ef5752262..d38582605a8 100644 --- a/samples/nanokernel/test/test_atomic/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_bluetooth/Makefile b/samples/nanokernel/test/test_bluetooth/Makefile index 5c92306d5f3..43c5c13ad7e 100644 --- a/samples/nanokernel/test/test_bluetooth/Makefile +++ b/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/ diff --git a/samples/nanokernel/test/test_context/Makefile b/samples/nanokernel/test/test_context/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_context/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_fifo/Makefile b/samples/nanokernel/test/test_fifo/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_fifo/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_fp_sharing/Makefile b/samples/nanokernel/test/test_fp_sharing/Makefile index 1f7099a0863..61ea212a804 100644 --- a/samples/nanokernel/test/test_fp_sharing/Makefile +++ b/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/ diff --git a/samples/nanokernel/test/test_ipi/Makefile b/samples/nanokernel/test/test_ipi/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_ipi/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_lifo/Makefile b/samples/nanokernel/test/test_lifo/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_lifo/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_mem_safe/Makefile b/samples/nanokernel/test/test_mem_safe/Makefile index b853be7744d..d9cdb727cb1 100644 --- a/samples/nanokernel/test/test_mem_safe/Makefile +++ b/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 diff --git a/samples/nanokernel/test/test_ring_buf/Makefile b/samples/nanokernel/test/test_ring_buf/Makefile index b853be7744d..d9cdb727cb1 100644 --- a/samples/nanokernel/test/test_ring_buf/Makefile +++ b/samples/nanokernel/test/test_ring_buf/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 diff --git a/samples/nanokernel/test/test_sema/Makefile b/samples/nanokernel/test/test_sema/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_sema/Makefile +++ b/samples/nanokernel/test/test_sema/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 diff --git a/samples/nanokernel/test/test_stack/Makefile b/samples/nanokernel/test/test_stack/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_stack/Makefile +++ b/samples/nanokernel/test/test_stack/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 diff --git a/samples/nanokernel/test/test_stackprot/Makefile b/samples/nanokernel/test/test_stackprot/Makefile index 51b1130b455..8299623b516 100644 --- a/samples/nanokernel/test/test_stackprot/Makefile +++ b/samples/nanokernel/test/test_stackprot/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_stackprot/src/ diff --git a/samples/nanokernel/test/test_static_idt/Makefile b/samples/nanokernel/test/test_static_idt/Makefile index 12d2e591a73..36c8c6c8712 100644 --- a/samples/nanokernel/test/test_static_idt/Makefile +++ b/samples/nanokernel/test/test_static_idt/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_static_idt/src/ diff --git a/samples/nanokernel/test/test_timer/Makefile b/samples/nanokernel/test/test_timer/Makefile index 323010378f8..b88cb759b5c 100644 --- a/samples/nanokernel/test/test_timer/Makefile +++ b/samples/nanokernel/test/test_timer/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 diff --git a/samples/nanokernel/test/test_xip/Makefile b/samples/nanokernel/test/test_xip/Makefile index 9df8cf1ffc8..e42d3002ad3 100644 --- a/samples/nanokernel/test/test_xip/Makefile +++ b/samples/nanokernel/test/test_xip/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_xip/src/ diff --git a/samples/net/buf/Makefile b/samples/net/buf/Makefile index 376a4267a36..a0ef2175886 100644 --- a/samples/net/buf/Makefile +++ b/samples/net/buf/Makefile @@ -1,4 +1,4 @@ -PLATFORM_CONFIG ?= basic_atom +PLATFORM_CONFIG ?= qemu_x86 MDEF_FILE = prj.mdef KERNEL_TYPE ?= nano CONF_FILE = prj_$(ARCH).conf diff --git a/samples/net/echo_client/Makefile b/samples/net/echo_client/Makefile index 5b6c9440eca..e49fb8be4e0 100644 --- a/samples/net/echo_client/Makefile +++ b/samples/net/echo_client/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 include $(ZEPHYR_BASE)/Makefile.inc diff --git a/samples/net/echo_server/Makefile b/samples/net/echo_server/Makefile index 99ff988479e..be0bf3d0772 100644 --- a/samples/net/echo_server/Makefile +++ b/samples/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 include $(ZEPHYR_BASE)/Makefile.inc diff --git a/samples/net/listener/Makefile b/samples/net/listener/Makefile index e1c9e24f629..b31efc70e76 100644 --- a/samples/net/listener/Makefile +++ b/samples/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 QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock diff --git a/samples/net/loopback_test/Makefile b/samples/net/loopback_test/Makefile index 9d4dd7315d2..bae995a4f16 100644 --- a/samples/net/loopback_test/Makefile +++ b/samples/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 include $(ZEPHYR_BASE)/Makefile.inc diff --git a/samples/net/test/test_15_4/Makefile b/samples/net/test/test_15_4/Makefile index f8e4bd3cbf1..24553717ead 100644 --- a/samples/net/test/test_15_4/Makefile +++ b/samples/net/test/test_15_4/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/test_15_4/src/ diff --git a/samples/net/test_15_4/Makefile b/samples/net/test_15_4/Makefile index 08dbefcff03..2b95916b77e 100644 --- a/samples/net/test_15_4/Makefile +++ b/samples/net/test_15_4/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 CFLAGS += -DNET_802154_TX_STACK_SIZE=5120 diff --git a/scripts/sanity_chk/arches/arm.ini b/scripts/sanity_chk/arches/arm.ini index ed67930fa61..e4e73046365 100644 --- a/scripts/sanity_chk/arches/arm.ini +++ b/scripts/sanity_chk/arches/arm.ini @@ -1,9 +1,10 @@ [arch] name = arm -platforms = basic_cortex_m3 fsl_frdm_k64f +platforms = qemu_cortex_m3 fsl_frdm_k64f -[basic_cortex_m3] +[qemu_cortex_m3] qemu_support = true [fsl_frdm_k64f] +qemu_support = false diff --git a/scripts/sanity_chk/arches/x86.ini b/scripts/sanity_chk/arches/x86.ini index c3a895dcbd4..fc57a29b601 100644 --- a/scripts/sanity_chk/arches/x86.ini +++ b/scripts/sanity_chk/arches/x86.ini @@ -1,14 +1,15 @@ [arch] name = x86 -platforms = basic_minuteia basic_atom galileo quark_se quark_d2000 +platforms = qemu_x86 basic_atom galileo quark_se quark_d2000 + +[qemu_x86] +qemu_support = true [basic_atom] -qemu_support = true - -[basic_minuteia] -qemu_support = true +qemu_support = false [galileo] +qemu_support = false [quark_se] qemu_support = false @@ -16,3 +17,4 @@ qemu_support = false [quark_d2000] qemu_support = false microkernel_support = false +