From 803b755554a69221f6d05a4b245f24045dfcd644 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 18 Apr 2021 01:50:16 +0700
Subject: [PATCH] update per review

---
 .github/workflows/build.yml                           | 4 +++-
 examples/device/board_test/CMakeLists.txt             | 2 +-
 examples/device/cdc_msc_freertos/CMakeLists.txt       | 2 +-
 examples/device/hid_composite_freertos/CMakeLists.txt | 2 +-
 examples/make.mk                                      | 3 ---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c0adb351e..f98612025 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -189,12 +189,14 @@ jobs:
       matrix:
         board:
         # Alphabetical order
+        # ESP32-S2
         - 'adafruit_feather_esp32s2'
         - 'adafruit_magtag_29gray'
         - 'adafruit_metro_esp32s2'
-        # - 'espressif_addax_1' # temporarily remove the board from test while espressif MR is not merged
         - 'espressif_kaluga_1'
         - 'espressif_saola_1'
+        # ESP32-S3
+        # - 'espressif_addax_1' # temporarily remove the board from test while espressif MR is not merged
 
     steps:
     - name: Setup Python
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