aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Kconfig
diff options
context:
space:
mode:
authorNicolas Munnich <[email protected]>2024-12-19 06:32:30 +0000
committerGitHub <[email protected]>2024-12-18 23:32:30 -0700
commitbb486619a183f6df7fbb4620c80164555a22da0b (patch)
tree1eb9beaf3794cd2e6f04e4a957b6e8a5145d8aa4 /app/Kconfig
parentcb867f92dbe4e32675c2137fc6aa914a44ecc8dc (diff)
downloadzmk-bb486619a183f6df7fbb4620c80164555a22da0b.tar.gz
zmk-bb486619a183f6df7fbb4620c80164555a22da0b.zip
fix: Kconfig refactor now works correctly with external modules (#2711)
Diffstat (limited to 'app/Kconfig')
-rw-r--r--app/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/Kconfig b/app/Kconfig
index 45270d141a..971c4991c7 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -687,13 +687,22 @@ module = ZMK
module-str = zmk
source "subsys/logging/Kconfig.template.log_config"
+# This loads ZMK's internal board and shield Kconfigs
rsource "boards/Kconfig"
rsource "boards/shields/*/Kconfig.defconfig"
rsource "boards/shields/*/Kconfig.shield"
+# This loads custom shields defconfigs (from BOARD_ROOT)
+# Duplicated from Kconfig.zephyr
+osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
+
+source "$(BOARD_DIR)/Kconfig.defconfig"
+
+# This loads board and shield Kconfigs found under zmk-config/config/
osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"
osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"
+# This loads ZMK's sensible defaults
rsource "Kconfig.defaults"
source "Kconfig.zephyr"