From 808fa9337725e92502c0c3b5fbcb2f27a22e4456 Mon Sep 17 00:00:00 2001
From: Xudong Zheng <7pkvm5aw@slicealias.com>
Date: Sat, 20 May 2023 12:46:26 -0400
Subject: [PATCH] refactor: rearrange Kconfig inclusion order

This makes it possible to override ZMK Kconfig options from shields.
---
 app/Kconfig | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Kconfig b/app/Kconfig
index a45f2dc2..bfa3e0f9 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -1,6 +1,13 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
+osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"
+osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"
+
+rsource "boards/shields/*/Kconfig.defconfig"
+rsource "boards/shields/*/Kconfig.shield"
+rsource "boards/Kconfig"
+
 mainmenu "ZMK Firmware"
 
 menu "ZMK"
@@ -717,12 +724,5 @@ module = ZMK
 module-str = zmk
 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"