espressif: group boards using target name as a family

`hw\bsp` separate one family folder to esp32s2, esp32s3
add board specific board.cmake file to override board specific options(features)
fix examples and test scripts to use new family approach

9 files changed, 20 insertions, 49 deletions

diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt
index 7658fae49..2b7712630 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 STREQUAL "esp32sx")
+if(FAMILY MATCHES "^(esp32s[2-3])*")
   cmake_minimum_required(VERSION 3.5)
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
diff --git a/examples/device/board_test/src/CMakeLists.txt b/examples/device/board_test/src/CMakeLists.txt
index e44863609..e4e1f4e9a 100644
--- a/examples/device/board_test/src/CMakeLists.txt
+++ b/examples/device/board_test/src/CMakeLists.txt
@@ -3,19 +3,12 @@ idf_component_register(SRCS "main.c"
                     INCLUDE_DIRS "."
                     REQUIRES freertos soc)
                     
-string(REGEX MATCH "^(esp32s[2-3])*" chip_target "$ENV{IDF_TARGET}")
+file(TO_NATIVE_PATH "${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}/board.cmake" board_cmake)
 
-if(NOT chip_target)
-    message(FATAL_ERROR "Incorrect target: $ENV{IDF_TARGET}" )
+if(EXISTS ${board_cmake})
+    include(${board_cmake})
 endif()
 
-string(TOUPPER ${chip_target} upper_case_target)
-
-target_compile_options(${COMPONENT_TARGET} PUBLIC
-  "-DCFG_TUSB_MCU=OPT_MCU_${upper_case_target}"
-  "-DCFG_TUSB_OS=OPT_OS_FREERTOS"
-)
-
 idf_component_get_property( FREERTOS_ORIG_INCLUDE_PATH freertos ORIG_INCLUDE_PATH)
 target_include_directories(${COMPONENT_TARGET} PUBLIC
   "${FREERTOS_ORIG_INCLUDE_PATH}"
diff --git a/examples/device/cdc_msc/CMakeLists.txt b/examples/device/cdc_msc/CMakeLists.txt
index 5f515c825..ca8f07ade 100644
--- a/examples/device/cdc_msc/CMakeLists.txt
+++ b/examples/device/cdc_msc/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TOP "../../..")
 get_filename_component(TOP "${TOP}" REALPATH)
 
 # Check for -DFAMILY=
-if(FAMILY STREQUAL "esp32sx")
+if(FAMILY MATCHES "^(esp32s[2-3])*")
   cmake_minimum_required(VERSION 3.5)
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
   project(${PROJECT})
diff --git a/examples/device/cdc_msc_freertos/CMakeLists.txt b/examples/device/cdc_msc_freertos/CMakeLists.txt
index 643cebebe..cf2dd822d 100644
--- a/examples/device/cdc_msc_freertos/CMakeLists.txt
+++ b/examples/device/cdc_msc_freertos/CMakeLists.txt
@@ -9,10 +9,10 @@ set(TOP "../../..")
 get_filename_component(TOP "${TOP}" REALPATH)
 
 # Check for -DFAMILY=
-if(FAMILY STREQUAL "esp32sx")
+if(FAMILY MATCHES "^(esp32s[2-3])*")
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
   project(${PROJECT})
 
 else()
-  message(FATAL_ERROR "Invalid FAMILY specified")
+  message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
 endif()
diff --git a/examples/device/cdc_msc_freertos/src/CMakeLists.txt b/examples/device/cdc_msc_freertos/src/CMakeLists.txt
index 17bc0b3eb..6b188fd30 100644
--- a/examples/device/cdc_msc_freertos/src/CMakeLists.txt
+++ b/examples/device/cdc_msc_freertos/src/CMakeLists.txt
@@ -2,21 +2,12 @@ idf_component_register(SRCS "main.c" "usb_descriptors.c" "msc_disk.c"
                     INCLUDE_DIRS "."
                     REQUIRES freertos soc)
 
-string(REGEX MATCH "^(esp32s[2-3])*" chip_target "$ENV{IDF_TARGET}")
+file(TO_NATIVE_PATH "${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}/board.cmake" board_cmake)
 
-if(NOT chip_target)
-    message(FATAL_ERROR "Incorrect target: $ENV{IDF_TARGET}" )
-else()
-    set(chip_family "esp32sx")
+if(EXISTS ${board_cmake})
+    include(${board_cmake})
 endif()
 
-string(TOUPPER ${chip_target} upper_case_target)
-
-target_compile_options(${COMPONENT_TARGET} PUBLIC
-  "-DCFG_TUSB_MCU=OPT_MCU_${upper_case_target}"
-  "-DCFG_TUSB_OS=OPT_OS_FREERTOS"
-)
-
 idf_component_get_property( FREERTOS_ORIG_INCLUDE_PATH freertos ORIG_INCLUDE_PATH)
 target_include_directories(${COMPONENT_TARGET} PUBLIC
   "${FREERTOS_ORIG_INCLUDE_PATH}"
@@ -37,5 +28,5 @@ target_sources(${COMPONENT_TARGET} PUBLIC
   "${TOP}/src/class/net/net_device.c"
   "${TOP}/src/class/usbtmc/usbtmc_device.c"
   "${TOP}/src/class/vendor/vendor_device.c"
-  "${TOP}/src/portable/espressif/${chip_family}/dcd_${chip_family}.c"
+  "${TOP}/src/portable/espressif/esp32sx/dcd_esp32sx.c"
 )
diff --git a/examples/device/hid_composite_freertos/CMakeLists.txt b/examples/device/hid_composite_freertos/CMakeLists.txt
index a3c7697aa..e2ba307a8 100644
--- a/examples/device/hid_composite_freertos/CMakeLists.txt
+++ b/examples/device/hid_composite_freertos/CMakeLists.txt
@@ -9,10 +9,9 @@ set(TOP "../../..")
 get_filename_component(TOP "${TOP}" REALPATH)
 
 # Check for -DFAMILY=
-if(FAMILY STREQUAL "esp32sx")
+if(FAMILY MATCHES "^(esp32s[2-3])*")
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
   project(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
 endif()
diff --git a/examples/device/hid_composite_freertos/src/CMakeLists.txt b/examples/device/hid_composite_freertos/src/CMakeLists.txt
index ae213a3c8..6d4a3c1e2 100644
--- a/examples/device/hid_composite_freertos/src/CMakeLists.txt
+++ b/examples/device/hid_composite_freertos/src/CMakeLists.txt
@@ -2,21 +2,12 @@ idf_component_register(SRCS "main.c" "usb_descriptors.c"
                     INCLUDE_DIRS "."
                     REQUIRES freertos soc)
 
-string(REGEX MATCH "^(esp32s[2-3])*" chip_target "$ENV{IDF_TARGET}")
+file(TO_NATIVE_PATH "${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}/board.cmake" board_cmake)
 
-if(NOT chip_target)
-    message(FATAL_ERROR "Incorrect target: $ENV{IDF_TARGET}" )
-else()
-    set(chip_family "esp32sx")
+if(EXISTS ${board_cmake})
+    include(${board_cmake})
 endif()
 
-string(TOUPPER ${chip_target} upper_case_target)
-
-target_compile_options(${COMPONENT_TARGET} PUBLIC
-  "-DCFG_TUSB_MCU=OPT_MCU_${upper_case_target}"
-  "-DCFG_TUSB_OS=OPT_OS_FREERTOS"
-)
-
 idf_component_get_property( FREERTOS_ORIG_INCLUDE_PATH freertos ORIG_INCLUDE_PATH)
 target_include_directories(${COMPONENT_TARGET} PUBLIC
   "${FREERTOS_ORIG_INCLUDE_PATH}"
@@ -37,5 +28,5 @@ target_sources(${COMPONENT_TARGET} PUBLIC
   "${TOP}/src/class/net/net_device.c"
   "${TOP}/src/class/usbtmc/usbtmc_device.c"
   "${TOP}/src/class/vendor/vendor_device.c"
-  "${TOP}/src/portable/espressif/${chip_family}/dcd_${chip_family}.c"
+  "${TOP}/src/portable/espressif/esp32sx/dcd_esp32sx.c"
 )
diff --git a/examples/host/cdc_msc_hid/CMakeLists.txt b/examples/host/cdc_msc_hid/CMakeLists.txt
index e9360a731..1b2be4565 100644
--- a/examples/host/cdc_msc_hid/CMakeLists.txt
+++ b/examples/host/cdc_msc_hid/CMakeLists.txt
@@ -7,12 +7,7 @@ set(TOP "../../..")
 get_filename_component(TOP "${TOP}" REALPATH)
 
 # Check for -DFAMILY=
-if(FAMILY STREQUAL "esp32sx")
-  cmake_minimum_required(VERSION 3.5)
-  include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
-  project(${PROJECT})
-
-elseif(FAMILY STREQUAL "rp2040")
+if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
   
   include(${TOP}/hw/bsp/${FAMILY}/pico_sdk_import.cmake)
diff --git a/examples/rules.mk b/examples/rules.mk
index 461683fad..00ad14292 100644
--- a/examples/rules.mk
+++ b/examples/rules.mk
@@ -6,7 +6,8 @@
 .DEFAULT_GOAL := all
 
 # ESP32-SX and RP2040 has its own CMake build system
-ifneq ($(FAMILY),esp32sx)
+ifneq ($(FAMILY),esp32s2)
+ifneq ($(FAMILY),esp32s3)
 ifneq ($(FAMILY),rp2040)
 # ---------------------------------------
 # GNU Make build system
@@ -136,6 +137,7 @@ else
 endif
 
 endif
+endif
 endif # GNU Make
 
 # ---------------------------------------