diff options
| author | hathach <[email protected]> | 2021-04-18 01:50:16 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-04-18 01:50:16 +0700 |
| commit | 803b755554a69221f6d05a4b245f24045dfcd644 (patch) | |
| tree | 0c56b8c6952d98a39cb90c288ae48f619d3b863c /examples | |
| parent | 38cc459c93d039968c4e89b302880e621e42eed3 (diff) | |
update per review
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/device/board_test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/device/cdc_msc_freertos/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/device/hid_composite_freertos/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/make.mk | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt index 2b7712630..698b0c96f 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) # Check for -DFAMILY= -if(FAMILY MATCHES "^(esp32s[2-3])*") +if(FAMILY MATCHES "^esp32s[2-3]") cmake_minimum_required(VERSION 3.5) include(${TOP}/hw/bsp/${FAMILY}/family.cmake) diff --git a/examples/device/cdc_msc_freertos/CMakeLists.txt b/examples/device/cdc_msc_freertos/CMakeLists.txt index cf2dd822d..aaac4d894 100644 --- a/examples/device/cdc_msc_freertos/CMakeLists.txt +++ b/examples/device/cdc_msc_freertos/CMakeLists.txt @@ -9,7 +9,7 @@ set(TOP "../../..") get_filename_component(TOP "${TOP}" REALPATH) # Check for -DFAMILY= -if(FAMILY MATCHES "^(esp32s[2-3])*") +if(FAMILY MATCHES "^esp32s[2-3]") include(${TOP}/hw/bsp/${FAMILY}/family.cmake) project(${PROJECT}) diff --git a/examples/device/hid_composite_freertos/CMakeLists.txt b/examples/device/hid_composite_freertos/CMakeLists.txt index e2ba307a8..ed734b954 100644 --- a/examples/device/hid_composite_freertos/CMakeLists.txt +++ b/examples/device/hid_composite_freertos/CMakeLists.txt @@ -9,7 +9,7 @@ set(TOP "../../..") get_filename_component(TOP "${TOP}" REALPATH) # Check for -DFAMILY= -if(FAMILY MATCHES "^(esp32s[2-3])*") +if(FAMILY MATCHES "^esp32s[2-3]") include(${TOP}/hw/bsp/${FAMILY}/family.cmake) project(${PROJECT}) else() diff --git a/examples/make.mk b/examples/make.mk index 09ddb1397..6366d6cef 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -27,9 +27,6 @@ endif # Board within family ifeq ($(BOARD_PATH),) BOARD_PATH := $(subst $(TOP)/,,$(wildcard $(TOP)/hw/bsp/*/boards/$(BOARD))) -ifneq ($(wildcard $(TOP)/hw/bsp/*/boards/$(BOARD)/board.mk),) - include $(TOP)/hw/bsp/*/boards/$(BOARD)/board.mk -endif FAMILY := $(word 3, $(subst /, ,$(BOARD_PATH))) FAMILY_PATH = hw/bsp/$(FAMILY) endif |