diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-08-20 10:51:35 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-08-20 11:38:36 -0400 |
| commit | 973087639329893e916d3d341ee4326d1c14a711 (patch) | |
| tree | 3225d3f0a3f5566716d18e6df2bea9df52ce2602 | |
| parent | 1797cfb5c5bc45291b71fbe7b23b3f1d1d57dd78 (diff) | |
fix(shields): Load Kconfig for out-of-tree shields
| -rw-r--r-- | app/Kconfig | 4 | ||||
| -rw-r--r-- | app/cmake/zmk_config.cmake | 1 |
2 files changed, 5 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" diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake index 518c3c3..017dd11 100644 --- a/app/cmake/zmk_config.cmake +++ b/app/cmake/zmk_config.cmake @@ -44,6 +44,7 @@ endif() set(CACHED_ZMK_CONFIG ${ZMK_CONFIG} CACHE STRING "Selected user ZMK config") if (ZMK_CONFIG) + set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}") if(EXISTS ${ZMK_CONFIG}/boards) message(STATUS "Adding ZMK config directory as board root: ${ZMK_CONFIG}") list(APPEND BOARD_ROOT ${ZMK_CONFIG}) |