Refactor CYW43xxx wi-fi driver to better work with CMake and move code out of the Portenta target folder (#292)

* Refactor Cypress WHD wifi & bluetooth drivers to work better with CMake and be vendor agnostic

* Fix some missed changes that belong in the other branch

* Fix build of Cypress targets that use the RTOS adapter.  Make it possible to build Cypress targets in baremetal mode via CMake.

* Try and fix check failures

* Fix a couple unintentional changes

Author: Jamie Smith

cmsis/device/rtos/mbed_lib.json

@@ -86,9 +86,6 @@
         "NUVOTON": {
             "idle-thread-stack-size-debug-extra": 512
         },
-        "MCU_PSOC6_M4": {
-            "target.macros_add": ["CY_RTOS_AWARE"]
-        },
         "ARM_MUSCA_B1": {
             "mutex-num": 4
         },

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CMakeLists.txt

@@ -5,6 +5,10 @@ if("PSOC6" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_PSOC6)
 endif()
 
+if("STM32H747_ARDUINO" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_STM32H747_ARDUINO)
+endif()
+
 add_subdirectory(firmware)
 
 target_include_directories(mbed-ble

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_CYW43XXX/CMakeLists.txt renamed to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_STM32H747_ARDUINO/CMakeLists.txt

@@ -1,4 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(firmware)
+target_sources(mbed-ble
+    PRIVATE
+        cy_bt_cordio_cfg.cpp
+)

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PORTENTA_H7/cy_bt_cordio_cfg.cpp renamed to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_STM32H747_ARDUINO/cy_bt_cordio_cfg.cpp

@@ -13,6 +13,10 @@ if("4343W" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(COMPONENT_4343W)
 endif()
 
+if("4343W_FS" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(COMPONENT_4343W_FS)
+endif()
+
 if("CYW9P62S1_43012EVB_01" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_CYW9P62S1_43012EVB_01)
 endif()

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/CMakeLists.txt

@@ -31,10 +31,6 @@ elseif("Silicon_Labs" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_Silicon_Labs)
 endif()
 
-if("WHD" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(COMPONENT_WHD)
-endif()
-
 target_link_libraries(mbed-emac
     PUBLIC
         mbed-netsocket-api

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W_FS/CMakeLists.txt renamed to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W_FS/CMakeLists.txt

@@ -1,144 +1,11 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(whd-bsp-integration EXCLUDE_FROM_ALL)
-
-add_library(mbed-cy-psoc6-whd-43012 STATIC EXCLUDE_FROM_ALL)
-target_include_directories(mbed-cy-psoc6-whd-43012
-    PUBLIC
-        wifi-host-driver/resources/firmware/COMPONENT_43012
-)
-target_sources(mbed-cy-psoc6-whd-43012 
-    PRIVATE
-        wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c
-        wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c
-        wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_bin.c
-        wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c
-)
-
-add_library(mbed-cy-psoc6-whd-43438 STATIC EXCLUDE_FROM_ALL)
-target_include_directories(mbed-cy-psoc6-whd-43438
-    PUBLIC
-        wifi-host-driver/resources/firmware/COMPONENT_43438
-)
-target_sources(mbed-cy-psoc6-whd-43438 
-    PRIVATE
-        wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c
-        wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c
-        wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_bin.c
-        wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c
-)
-
-add_library(mbed-cy-psoc6-whd-4343w STATIC EXCLUDE_FROM_ALL)
-target_include_directories(mbed-cy-psoc6-whd-4343w
-    PUBLIC
-        wifi-host-driver/resources/firmware/COMPONENT_4343W
-)
-target_sources(mbed-cy-psoc6-whd-4343w 
-    PRIVATE
-        wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c
-        wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c
-        wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_bin.c
-        wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c
-)
-
-add_library(mbed-cy8ckit-062s2-43012-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062s2-43012-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062S2_43012)
-
-add_library(mbed-cy8ckit-062s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062S2_4343W)
-
-add_library(mbed-cy8ckit-062-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062_4343W)
-
-add_library(mbed-cy8ckit-062-wifi-bt-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062-wifi-bt-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT)
-
-add_library(mbed-cy8ckit-064s1-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-064s1-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064S1_4343W)
-
-add_library(mbed-cy8ckit-064s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-064s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064S2_4343W)
-
-add_library(mbed-cy8cmod-062s2-43012-whd INTERFACE)
-target_include_directories(mbed-cy8cmod-062s2-43012-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062S2_43012)
-
-add_library(mbed-cy8cmod-062s3-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cmod-062s3-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062S3_4343W)
-
-add_library(mbed-cy8cmod-062-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cmod-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062_4343W)
-
-add_library(mbed-cy8cproto-062s3-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cproto-062s3-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CPROTO_062S3_4343W)
-
-add_library(mbed-cy8cproto-062-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cproto-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CPROTO_062_4343W)
-
-add_library(mbed-cytfm-064b0s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cytfm-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYTFM_064B0S2_4343W)
-
-add_library(mbed-cyw943012p6evb-01-whd INTERFACE)
-target_include_directories(mbed-cyw943012p6evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW943012P6EVB_01)
-
-add_library(mbed-cyw943012wcd2-whd INTERFACE)
-target_include_directories(mbed-cyw943012wcd2-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW943012WCD2)
-
-add_library(mbed-cyw9p62s1-43012car-01-whd INTERFACE)
-target_include_directories(mbed-cyw9p62s1-43012car-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43012CAR_01)
-
-add_library(mbed-cyw9p62s1-43012evb-01-whd INTERFACE)
-target_include_directories(mbed-cyw9p62s1-43012evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43012EVB_01)
-
-add_library(mbed-cyw9p62s1-43438evb-01-whd INTERFACE)
-target_include_directories(mbed-cyw9p62s1-43438evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43438EVB_01)
-
-add_library(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W)
-
-
-add_library(mbed-cy-psoc6-whd STATIC EXCLUDE_FROM_ALL)
-
-target_include_directories(mbed-cy-psoc6-whd
-    PUBLIC
-        wifi-host-driver
-        wifi-host-driver/inc
-        wifi-host-driver/resources/resource_imp
-        wifi-host-driver/src
-        wifi-host-driver/src/include
-        wifi-host-driver/src/bus_protocols
-)
-
-target_sources(mbed-cy-psoc6-whd
-    PRIVATE
-        wifi-host-driver/resources/resource_imp/whd_resources.c
-
-        wifi-host-driver/src/whd_ap.c
-        wifi-host-driver/src/whd_buffer_api.c
-        wifi-host-driver/src/whd_cdc_bdc.c
-        wifi-host-driver/src/whd_chip.c
-        wifi-host-driver/src/whd_chip_constants.c
-        wifi-host-driver/src/whd_clm.c
-        wifi-host-driver/src/whd_debug.c
-        wifi-host-driver/src/whd_events.c
-        wifi-host-driver/src/whd_logging.c
-        wifi-host-driver/src/whd_management.c
-        wifi-host-driver/src/whd_network_if.c
-        wifi-host-driver/src/whd_resource_if.c
-        wifi-host-driver/src/whd_sdpcm.c
-        wifi-host-driver/src/whd_thread.c
-        wifi-host-driver/src/whd_utils.c
-        wifi-host-driver/src/whd_wifi.c
-        wifi-host-driver/src/whd_wifi_api.c
-        wifi-host-driver/src/whd_wifi_p2p.c
-
-        wifi-host-driver/src/bus_protocols/whd_bus.c
-        wifi-host-driver/src/bus_protocols/whd_bus_common.c
-        wifi-host-driver/src/bus_protocols/whd_bus_sdio_protocol.c
-        wifi-host-driver/src/bus_protocols/whd_bus_spi_protocol.c
-)
-
-target_compile_definitions(mbed-cy-psoc6-whd
-    PUBLIC
-        MBED_CONF_CY_PSOC6_WHD_PRESENT=1
-)
+# If not running on a Cypress chip, we need to build the CyHAL support library.
+if(NOT "Cypress" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(minimal-cyhal)
+endif()
+
+add_subdirectory(whd-bsp-integration)
+add_subdirectory(wifi-host-driver)
+add_subdirectory(whd_mac)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W_FS/w_bt_firmware_controller.c renamed to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W_FS/w_bt_firmware_controller.c

@@ -1,6 +1,6 @@
 {
   "name": "cy_psoc6_whd",
   "config": {
-        "present": 1
+    "present": 1
   }
 }