From f4b6e6c380b1da2b91d20222ec0df24df9aa72c5 Mon Sep 17 00:00:00 2001
From: dumam <batek.nowak@yahoo.pl>
Date: Sun, 7 Nov 2021 03:18:14 +0100
Subject: [PATCH] Fix flat struct when shield is located in main config dir

---
 app/cmake/zmk_config.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake
index 558d8de2..523f7020 100644
--- a/app/cmake/zmk_config.cmake
+++ b/app/cmake/zmk_config.cmake
@@ -71,7 +71,7 @@ foreach(root ${BOARD_ROOT})
 	if (NOT DEFINED BOARD_DIR_NAME)
 		find_path(BOARD_DIR
 			NAMES ${BOARD}_defconfig
-			PATHS ${root}/boards/*/*
+			PATHS ${root}/boards/*/* ${root}/boards
 			NO_DEFAULT_PATH
 			)
 		if(BOARD_DIR)
@@ -83,13 +83,13 @@ foreach(root ${BOARD_ROOT})
 	if(DEFINED SHIELD)
 		find_path(shields_refs_list
 		    NAMES ${SHIELD}.overlay
-		    PATHS ${root}/boards/shields/*
+		    PATHS ${root}/boards/shields/* ${root}
 		    NO_DEFAULT_PATH)
 		foreach(shield_path ${shields_refs_list})
 			get_filename_component(SHIELD_DIR_NAME ${shield_path} NAME)
 			list(APPEND KEYMAP_DIRS ${shield_path})
 		endforeach()
-		
+
 		# make it consistent with other naming conventions used in project
 		set(SHIELD_DIR "${shields_refs_list}")
 	endif()