From bb486619a183f6df7fbb4620c80164555a22da0b Mon Sep 17 00:00:00 2001
From: Nicolas Munnich <98408764+Nick-Munnich@users.noreply.github.com>
Date: Thu, 19 Dec 2024 06:32:30 +0000
Subject: [PATCH] fix: Kconfig refactor now works correctly with external
 modules (#2711)

---
 app/Kconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/Kconfig b/app/Kconfig
index 45270d141a0..971c4991c7c 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"