summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2021-01-22 09:41:41 +0700
committerhathach <[email protected]>2021-01-22 09:41:41 +0700
commit2b3008f9a863e4fa5e10f24971976928c8101764 (patch)
tree3d1a155c53f0887c7c4ac5439cc3fb4f4f487112
parentffe0fc75376a7560074ebc5e54fa837a89137e3c (diff)
fix esp32s2 ci build
-rw-r--r--examples/device/board_test/CMakeLists.txt2
-rw-r--r--tools/build_esp32s.py7
2 files changed, 3 insertions, 6 deletions
diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt
index f0437dd04..c09ffe215 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 44364806b..c63bbf6d2 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()