zephyr: Move Zephyr build to top level
The Zephyr build system does strange things if it refers to source
directories above the main Makefile (generating
outdir/<target>/../boot/... paths). For now, fix this by moving the
Zephyr Makefile to the top-level in the tree. This shouldn't have much
impact on Mynewt, as it doesn't use makefiles.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b6aa568
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+outdir/
+.*.swp
+target.sh
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..fd5a412
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+BOARD ?= qemu_x86
+CONF_FILE = zephyr/prj.conf
+SOURCE_DIR = zephyr/src
+
+include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/zephyr/build_boot.sh b/build_boot.sh
similarity index 66%
rename from zephyr/build_boot.sh
rename to build_boot.sh
index 2fc8326..b998812 100755
--- a/zephyr/build_boot.sh
+++ b/build_boot.sh
@@ -1,6 +1,6 @@
#! /bin/bash
source $(dirname 0)/target.sh
-source ../../zephyr/zephyr-env.sh
+source ../zephyr/zephyr-env.sh
make BOARD=$BOARD "$@"
diff --git a/zephyr/Makefile b/zephyr/Makefile
deleted file mode 100644
index 4de50f9..0000000
--- a/zephyr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-BOARD ?= qemu_x86
-CONF_FILE = prj.conf
-
-include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/zephyr/src/Makefile b/zephyr/src/Makefile
index 69283e3..0996747 100644
--- a/zephyr/src/Makefile
+++ b/zephyr/src/Makefile
@@ -1,5 +1,5 @@
-subdir-ccflags-y += -I$(PROJECT)/../boot/bootutil/include
-subdir-ccflags-y += -I$(PROJECT)/include
+subdir-ccflags-y += -I$(PROJECT)/boot/bootutil/include
+subdir-ccflags-y += -I$(PROJECT)/zephyr/include
obj-y += main.o
obj-y += flash_map.o hal_flash.o os.o