summaryrefslogtreecommitdiff
path: root/app/Kconfig
diff options
context:
space:
mode:
authortjcampie <tjcampie@zmk.local>2020-08-21 06:37:04 -0500
committertjcampie <tjcampie@zmk.local>2020-08-21 06:37:04 -0500
commit6b23c7f554dbb27794cda5bff42545b1532b02c8 (patch)
tree095a1c5189f690baa07e839d1cc7ec8c2d958235 /app/Kconfig
parent5b76179bf6db93717cde0c4da39b5421a0c5bad3 (diff)
parent1ff13676f7fbab5c0d69317be0d186709a7872c8 (diff)
Merge branch 'main' of https://github.com/zmkfirmware/zmk into main
Diffstat (limited to 'app/Kconfig')
-rw-r--r--app/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/Kconfig b/app/Kconfig
index 00d4ae3..877fce4 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -193,6 +193,10 @@ source "subsys/logging/Kconfig.template.log_config"
rsource "boards/Kconfig"
rsource "boards/shields/*/Kconfig.defconfig"
+rsource "boards/shields/*/Kconfig.shield"
+
+osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"
+osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"
source "Kconfig.zephyr"