From d01061a198c341490384840cd24f3af8e0137983 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Mon, 29 Aug 2016 18:13:07 +0300
Subject: [PATCH] zephyr/Makefile: Switch to qemu_x86 by default.

As it supports QEMU virtual networking.
---
 zephyr/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/zephyr/Makefile b/zephyr/Makefile
index 0102f68a8..fc1db7f1c 100644
--- a/zephyr/Makefile
+++ b/zephyr/Makefile
@@ -9,15 +9,17 @@
 # Zephyr build system.
 #
 
-ARCH ?= arm
-BOARD = qemu_cortex_m3
+ARCH ?= x86
+BOARD = qemu_x86
 
 # Zephyr toolchain config is 2-pass, so included twice
 include $(ZEPHYR_BASE)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT)
 include $(ZEPHYR_BASE)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT)
 
-CFLAGS_CORTEX_M3 = -mthumb -mcpu=cortex-m3 -mabi=aapcs
-CFLAGS_TARGET = $(CFLAGS_CORTEX_M3)
+CFLAGS_arm = -mthumb -mcpu=cortex-m3 -mabi=aapcs -DCONFIG_ARM=y -DCONFIG_ISA_THUMB2=y
+CFLAGS_x86 = -fno-asynchronous-unwind-tables -ffreestanding -fno-stack-protector \
+    -fno-omit-frame-pointer -mpreferred-stack-boundary=2 -mno-sse -march=pentium -DCONFIG_X86=1
+CFLAGS_TARGET = $(CFLAGS_$(ARCH))
 
 include ../py/mkenv.mk
 include ../py/py.mk