diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt
index f0437dd0..c09ffe21 100644
--- a/examples/device/board_test/CMakeLists.txt
+++ b/examples/device/board_test/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TOP "../../..")
 get_filename_component(TOP "${TOP}" REALPATH)
 
 # Add example src and bsp directories
-set(EXTRA_COMPONENT_DIRS "src" "${TOP}/hw/bsp/${BOARD}")
+set(EXTRA_COMPONENT_DIRS "src" "${TOP}/hw/bsp/esp32s2/boards" "${TOP}/hw/bsp/esp32s2/components")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 set(SUPPORTED_TARGETS esp32s2)
diff --git a/tools/build_esp32s.py b/tools/build_esp32s.py
index 44364806..c63bbf6d 100644
--- a/tools/build_esp32s.py
+++ b/tools/build_esp32s.py
@@ -34,12 +34,9 @@ all_boards = []
 if len(sys.argv) > 2:
     all_boards.append(sys.argv[2])
 else:
-    for entry in os.scandir("hw/bsp"):
+    for entry in os.scandir("hw/bsp/esp32s2/boards"):
         if entry.is_dir():
-            with open(entry.path + '/board.mk') as mk:
-                # Only includes ESP32-S2 board
-                if 'CROSS_COMPILE = xtensa-esp32s2-elf-' in mk.read():
-                    all_boards.append(entry.name)
+            all_boards.append(entry.name)
                                 
 all_boards.sort()