diff options
| author | Ha Thach <[email protected]> | 2023-04-06 00:39:39 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-06 00:39:39 +0700 |
| commit | 5f327dd49fea1ae2cf73e1d371a8e9e37ac1e12f (patch) | |
| tree | 2053acb89d5671d4e06ad8400f82f2b600804ab2 /tools | |
| parent | f7aa716a61db0b951c8632939f1b5d5625d2c191 (diff) | |
| parent | 4f96a1f3b2f4dd265214594450277e4851680258 (diff) | |
Merge pull request #2006 from hathach/cmake
Cmake
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_esp32.py (renamed from tools/build_esp32sx.py) | 5 | ||||
| -rw-r--r-- | tools/build_family.py | 4 | ||||
| -rw-r--r-- | tools/build_utils.py | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tools/build_esp32sx.py b/tools/build_esp32.py index 2947a0a6b..00783bf58 100644 --- a/tools/build_esp32sx.py +++ b/tools/build_esp32.py @@ -37,10 +37,7 @@ all_examples.sort() # Build all boards if not specified all_boards = [] -for entry in os.scandir("hw/bsp/esp32s2/boards"): - if entry.is_dir(): - all_boards.append(entry.name) -for entry in os.scandir("hw/bsp/esp32s3/boards"): +for entry in os.scandir("hw/bsp/espressif/boards"): if entry.is_dir(): all_boards.append(entry.name) filter_with_input(all_boards) diff --git a/tools/build_family.py b/tools/build_family.py index 532938d42..f9f7261fe 100644 --- a/tools/build_family.py +++ b/tools/build_family.py @@ -42,7 +42,7 @@ if __name__ == '__main__': # If examples are not specified in arguments, build all all_examples = [] for dir1 in os.scandir("examples"): - if dir1.is_dir(): + if dir1.is_dir() and 'cmake-build' not in dir1.name: for entry in os.scandir(dir1.path): if entry.is_dir(): all_examples.append(dir1.name + '/' + entry.name) @@ -52,7 +52,7 @@ if __name__ == '__main__': # If family are not specified in arguments, build all all_families = [] for entry in os.scandir("hw/bsp"): - if entry.is_dir() and os.path.isdir(entry.path + "/boards") and entry.name not in ("esp32s2", "esp32s3"): + if entry.is_dir() and os.path.isdir(entry.path + "/boards") and entry.name != 'espressif': all_families.append(entry.name) filter_with_input(all_families) all_families.sort() diff --git a/tools/build_utils.py b/tools/build_utils.py index 905d06a86..ec850e732 100644 --- a/tools/build_utils.py +++ b/tools/build_utils.py @@ -53,6 +53,13 @@ def skip_example(example, board): token = token.strip("\"") _, opt_mcu = token.split("=") mcu = opt_mcu[len("OPT_MCU_"):] + break + if "esp32s2" in token: + mcu = "ESP32S2" + break + if "esp32s3" in token: + mcu = "ESP32S3" + break # Skip all OPT_MCU_NONE these are WIP port if mcu == "NONE": |