From c4a6d9c631a3e529aeedeaf5c24fa1bd748d493f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Mar 2019 16:15:42 +0200 Subject: [PATCH] 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. --- ports/zephyr/prj_base.conf | 3 --- ports/zephyr/prj_frdm_k64f.conf | 3 +++ ports/zephyr/prj_frdm_kw41z.conf | 3 +++ 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