Revert "fix dir order - otherwise mixing between zmk-config and built…

…-ins breaks" This reverts commit ae7b1b9.
zmkfirmware · Oct 27, 2023 · bab5391 · bab5391
1 parent ae7b1b9
commit bab5391
Showing 1 changed file with 60 additions and 61 deletions.
diff --git a/cmake/modules/shields.cmake b/cmake/modules/shields.cmake
@@ -40,76 +40,75 @@ endif()
 # After processing all shields, only invalid shields will be left in this list.
 set(SHIELD-NOTFOUND ${SHIELD_AS_LIST})
 
-if(DEFINED SHIELD)
-  foreach(s ${SHIELD_AS_LIST})
-
-  # Use BOARD to search for a '_defconfig' file.
-  # e.g. zephyr/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig.
-  # When found, use that path to infer the ARCH we are building for.
-  foreach(root ${BOARD_ROOT})
-    set(shield_dir ${root}/boards/shields)
-    # Match the Kconfig.shield files in the shield directories to make sure we are
-    # finding shields, e.g. x_nucleo_iks01a1/Kconfig.shield
-    file(GLOB_RECURSE shields_refs_list ${shield_dir}/*/Kconfig.shield)
-
-    # The above gives a list like
-    # x_nucleo_iks01a1/Kconfig.shield;x_nucleo_iks01a2/Kconfig.shield
-    # we construct a list of shield names by extracting the folder and find
-    # and overlay files in there. Each overlay corresponds to a shield.
-    # We obtain the shield name by removing the overlay extension.
-    unset(SHIELD_LIST)
-    foreach(shields_refs ${shields_refs_list})
-      get_filename_component(shield_path ${shields_refs} DIRECTORY)
-      file(GLOB shield_overlays RELATIVE ${shield_path} ${shield_path}/*.overlay)
-      foreach(overlay ${shield_overlays})
-        get_filename_component(shield ${overlay} NAME_WE)
-        list(APPEND SHIELD_LIST ${shield})
-        set(SHIELD_DIR_${shield} ${shield_path})
-      endforeach()
+# Use BOARD to search for a '_defconfig' file.
+# e.g. zephyr/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig.
+# When found, use that path to infer the ARCH we are building for.
+foreach(root ${BOARD_ROOT})
+  set(shield_dir ${root}/boards/shields)
+  # Match the Kconfig.shield files in the shield directories to make sure we are
+  # finding shields, e.g. x_nucleo_iks01a1/Kconfig.shield
+  file(GLOB_RECURSE shields_refs_list ${shield_dir}/*/Kconfig.shield)
+
+  # The above gives a list like
+  # x_nucleo_iks01a1/Kconfig.shield;x_nucleo_iks01a2/Kconfig.shield
+  # we construct a list of shield names by extracting the folder and find
+  # and overlay files in there. Each overlay corresponds to a shield.
+  # We obtain the shield name by removing the overlay extension.
+  unset(SHIELD_LIST)
+  foreach(shields_refs ${shields_refs_list})
+    get_filename_component(shield_path ${shields_refs} DIRECTORY)
+    file(GLOB shield_overlays RELATIVE ${shield_path} ${shield_path}/*.overlay)
+    foreach(overlay ${shield_overlays})
+      get_filename_component(shield ${overlay} NAME_WE)
+      list(APPEND SHIELD_LIST ${shield})
+      set(SHIELD_DIR_${shield} ${shield_path})
     endforeach()
+  endforeach()
 
-    if(NOT ${s} IN_LIST SHIELD_LIST)
-      continue()
-    endif()
-
-    if(BOARD_DIR AND NOT (${root} STREQUAL ${ZEPHYR_BASE}))
-      set(SHIELD_${s}_OUT_OF_TREE 1)
-    endif()
+  if(DEFINED SHIELD)
+    foreach(s ${SHIELD_AS_LIST})
+      if(NOT ${s} IN_LIST SHIELD_LIST)
+        continue()
+      endif()
 
-    list(REMOVE_ITEM SHIELD-NOTFOUND ${s})
+      if(BOARD_DIR AND NOT (${root} STREQUAL ${ZEPHYR_BASE}))
+        set(SHIELD_${s}_OUT_OF_TREE 1)
+      endif()
 
-    # if shield config flag is on, add shield overlay to the shield overlays
-    # list and dts_fixup file to the shield fixup file
-    list(APPEND
-      shield_dts_files
-      ${SHIELD_DIR_${s}}/${s}.overlay
-      )
+      list(REMOVE_ITEM SHIELD-NOTFOUND ${s})
 
-    list(APPEND
-      SHIELD_DIRS
-      ${SHIELD_DIR_${s}}
-      )
+      # if shield config flag is on, add shield overlay to the shield overlays
+      # list and dts_fixup file to the shield fixup file
+      list(APPEND
+        shield_dts_files
+        ${SHIELD_DIR_${s}}/${s}.overlay
+        )
 
-    # search for shield/shield.conf file
-    if(EXISTS ${SHIELD_DIR_${s}}/${s}.conf)
-      # add shield.conf to the shield config list
       list(APPEND
-        shield_conf_files
-        ${SHIELD_DIR_${s}}/${s}.conf
+        SHIELD_DIRS
+        ${SHIELD_DIR_${s}}
         )
-    endif()
-
-    zephyr_file(CONF_FILES ${SHIELD_DIR_${s}}/boards
-                DTS   shield_dts_files
-                KCONF shield_conf_files
-    )
-    zephyr_file(CONF_FILES ${SHIELD_DIR_${s}}/boards/${s}
-                DTS   shield_dts_files
-                KCONF shield_conf_files
-    )
+
+      # search for shield/shield.conf file
+      if(EXISTS ${SHIELD_DIR_${s}}/${s}.conf)
+        # add shield.conf to the shield config list
+        list(APPEND
+          shield_conf_files
+          ${SHIELD_DIR_${s}}/${s}.conf
+          )
+      endif()
+
+      zephyr_file(CONF_FILES ${SHIELD_DIR_${s}}/boards
+                  DTS   shield_dts_files
+                  KCONF shield_conf_files
+      )
+      zephyr_file(CONF_FILES ${SHIELD_DIR_${s}}/boards/${s}
+                  DTS   shield_dts_files
+                  KCONF shield_conf_files
+      )
     endforeach()
-  endforeach()
-endif()
+  endif()
+endforeach()
 
 # Prepare shield usage command printing.
 # This command prints all shields in the system in the following cases: