Merge pull request #26 from andrewboie/master
x86 config updates
diff --git a/Makefile b/Makefile
index 25d06de..410ed4b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
BOARD ?= qemu_x86
# Additional board-specific Zephyr configuration
-CONF_FILE += $(wildcard boot/zephyr/targets/$(BOARD).conf)
+CONF_FILE += $(wildcard boot/zephyr/$(BOARD).conf)
# The source to the Zephyr-specific code lives here.
SOURCE_DIR = boot/zephyr
diff --git a/boot/zephyr/arduino_101.conf b/boot/zephyr/arduino_101.conf
index b58b0d9..ae50df8 100644
--- a/boot/zephyr/arduino_101.conf
+++ b/boot/zephyr/arduino_101.conf
@@ -2,3 +2,7 @@
CONFIG_TEXT_SECTION_OFFSET=0x30
CONFIG_ROM_SIZE=64
CONFIG_SOC_FLASH_QMSI=y
+CONFIG_GPIO_QMSI=n
+CONFIG_PINMUX_QMSI=n
+CONFIG_EXCEPTION_DEBUG=n
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=0