summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2019-03-28 16:15:42 +0200
committerDamien George <damien.p.george@gmail.com>2019-05-24 15:33:02 +1000
commitc4a6d9c631a3e529aeedeaf5c24fa1bd748d493f (patch)
tree14ca8280c95c86a27b225c484a8ddd5353ab1913
parentb88bf42793d7469acaeb8b9bd279c0a8c9d20558 (diff)
zephyr: Switch back to enabling I2C in board-specific configs.
I2C can't be enabled in prj_base.conf because it's a board-specific feature. For example, if a board doesn't have I2C but CONFIG_I2C=y then the build will fail (on Zephyr build system side). The patch here gets the qemu_cortex_m3 build working again.
-rw-r--r--ports/zephyr/prj_base.conf3
-rw-r--r--ports/zephyr/prj_frdm_k64f.conf3
-rw-r--r--ports/zephyr/prj_frdm_kw41z.conf3
3 files changed, 6 insertions, 3 deletions
diff --git a/ports/zephyr/prj_base.conf b/ports/zephyr/prj_base.conf
index 58206a0bc..993dfdc26 100644
--- a/ports/zephyr/prj_base.conf
+++ b/ports/zephyr/prj_base.conf
@@ -14,9 +14,6 @@ CONFIG_NEWLIB_LIBC=y
CONFIG_FLOAT=y
CONFIG_MAIN_STACK_SIZE=4736
-# Drivers
-CONFIG_I2C=y
-
# Enable sensor subsystem (doesn't add code if not used).
# Specific sensors should be enabled per-board.
CONFIG_SENSOR=y
diff --git a/ports/zephyr/prj_frdm_k64f.conf b/ports/zephyr/prj_frdm_k64f.conf
index 477f3b825..c2166c00d 100644
--- a/ports/zephyr/prj_frdm_k64f.conf
+++ b/ports/zephyr/prj_frdm_k64f.conf
@@ -1,6 +1,9 @@
# Networking drivers
CONFIG_NET_L2_ETHERNET=y
+# Hardware features
+CONFIG_I2C=y
+
# Sensor drivers
CONFIG_FXOS8700=y
CONFIG_FXOS8700_MODE_HYBRID=y
diff --git a/ports/zephyr/prj_frdm_kw41z.conf b/ports/zephyr/prj_frdm_kw41z.conf
index 486ece2bd..ff7b7887e 100644
--- a/ports/zephyr/prj_frdm_kw41z.conf
+++ b/ports/zephyr/prj_frdm_kw41z.conf
@@ -1,3 +1,6 @@
+# Hardware features
+CONFIG_I2C=y
+
# Sensor drivers
CONFIG_FXOS8700=y
CONFIG_FXOS8700_MODE_HYBRID=y