mbed-ce · multiplemonomials · May 8, 2025 · Apr 12, 2024 · Jun 22, 2024 · Jul 29, 2024
diff --git a/connectivity/drivers/cellular/GEMALTO/CMakeLists.txt b/connectivity/drivers/cellular/GEMALTO/CMakeLists.txt
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if("COMPONENT_GEMALTO_CINTERION=1" IN_LIST MBED_TARGET_DEFINITIONS)
-	add_subdirectory(CINTERION)
+	add_subdirectory(COMPONENT_GEMALTO_CINTERION)
 endif()
diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 if("DISCO_H747I" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_DISCO_H747I)
-elseif("PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
+elseif("ARDUINO_PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_PORTENTA_H7)
 elseif("NUCLEO_H743ZI2" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_NUCLEO_H743ZI2)

diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(mbed-minimal-cyhal STATIC
 target_include_directories(mbed-minimal-cyhal PUBLIC .)
 target_link_libraries(mbed-minimal-cyhal PUBLIC
 	mbed-core-flags
-	mbed-cy-rtos-abstraction)
+	mbed-rtos-flags)
 
 # This is needed in order to make cybsp_wifi.h include cycfg.h
 target_compile_definitions(mbed-minimal-cyhal PUBLIC COMPONENT_CUSTOM_DESIGN_MODUS)

diff --git a/...OMPONENT_WHD/minimal-cyhal/TARGET_STM32H7/TARGET_STM32H747_ARDUINO/minimal_cyhal_config.h b/...OMPONENT_WHD/minimal-cyhal/TARGET_STM32H7/TARGET_STM32H747_ARDUINO/minimal_cyhal_config.h
@@ -59,7 +59,7 @@
 #define BSP_LED1            PI_12
 #define BSP_LED2            PE_3
 #define BSP_LED3            PJ_13
-#elif TARGET_ARDUINO_PORTENTA
+#elif TARGET_ARDUINO_PORTENTA_H7
 #define WIFI_SDIO_OOB_IRQ   PJ_5
 #define WIFI_WL_REG_ON      PJ_1
 #define BSP_LED1            PK_5

diff --git a/...NENT_WHD/minimal-cyhal/TARGET_STM32H7/TARGET_STM32H747_ARDUINO/wiced_filesystem_setup.cpp b/...NENT_WHD/minimal-cyhal/TARGET_STM32H7/TARGET_STM32H747_ARDUINO/wiced_filesystem_setup.cpp
@@ -58,6 +58,8 @@ MBED_WEAK wiced_result_t whd_firmware_check_hook(const char *mounted_name, int m
     return WICED_ERROR;
 }
 
+wiced_filesystem_t resource_fs_handle = 0;
+
 wiced_result_t wiced_filesystem_setup()
 {
     static QSPIFBlockDevice *qspi_bd = nullptr;
@@ -82,6 +84,7 @@ wiced_result_t wiced_filesystem_setup()
         mbr_bd = new mbed::MBRBlockDevice(qspi_bd, WIFI_DEFAULT_PARTITION);
         if(mbr_bd->init() != mbed::BD_ERROR_OK)
         {
+            whd_firmware_check_hook(WIFI_DEFAULT_MOUNT_NAME, true);
             delete mbr_bd;
             mbr_bd = nullptr;
             return WICED_ERROR;

diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/cyhal_gpio.cpp b/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/cyhal_gpio.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "cyhal.h"
 #include "cybsp.h"
-#include "drivers/DigitalIn.h"
+#include "drivers/DigitalOut.h"
 #include "drivers/InterruptIn.h"
 
 #include <minimal_cyhal_config.h>

diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/wiced_filesystem.h b/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/wiced_filesystem.h
@@ -76,9 +76,9 @@ typedef int wiced_file_t;
  */
 typedef int wiced_filesystem_handle_type_t;
 
-// Global "FS handle" object.  Just here to match the WHD driver's expectations, we have one global
+// Global "FS handle" object.  Just here to match the WHD driver's expectations, we in fact have one global
 // filesystem object.
-static wiced_filesystem_t resource_fs_handle = 0;
+extern wiced_filesystem_t resource_fs_handle;
 
 /**
  * @brief Sets up the file system where the wifi module resources will be loaded from.

diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/whd_mac/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/whd_mac/CMakeLists.txt
@@ -2,15 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-wifi
-    INTERFACE
+    PUBLIC
         .
         ./interface
         ./network
         ./utils
 )
 
 target_sources(mbed-wifi
-    INTERFACE
+    PRIVATE
         interface/CyDhcpServer.cpp
         interface/WhdAccessPoint.cpp
         interface/WhdSTAInterface.cpp

diff --git a/...s/wifi/COMPONENT_WHD/wifi-host-driver/resources/firmware/COMPONENT_4343W_FS/4343WA1_bin.c b/...s/wifi/COMPONENT_WHD/wifi-host-driver/resources/firmware/COMPONENT_4343W_FS/4343WA1_bin.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #include "wiced_resource.h"
+#include "mbed-target-config.h"
 
 #if defined(CY_STORAGE_WIFI_DATA)
 CY_SECTION_WHD(CY_STORAGE_WIFI_DATA) __attribute__((used))
@@ -25489,5 +25490,9 @@ const unsigned char wifi_firmware_image_data[421098] = {
         49, 45, 53, 97, 102, 99, 56, 99, 49, 101, 0, 254, 0, 68, 86, 73, 68,
         32, 48, 49, 45, 101, 100, 48, 100, 55, 97, 53, 54
 };
-resource_hnd_t wifi_firmware_image = { RESOURCE_IN_EXTERNAL_STORAGE, 421098, {.fs = { 0, "/wlan/4343WA1.BIN" }}};
 
+#if MBED_CONF_TARGET_WIFI_DRIVER_IN_QSPI_FLASH
+resource_hnd_t wifi_firmware_image = { RESOURCE_IN_EXTERNAL_STORAGE, 421098, {.fs = { 0, "/wlan/4343WA1.BIN" }}};
+#else
+const resource_hnd_t wifi_firmware_image = { RESOURCE_IN_MEMORY, 421098, {.mem = { (const char *) wifi_firmware_image_data }}};
+#endif
diff --git a/connectivity/lwipstack/mbed_lib.json5 b/connectivity/lwipstack/mbed_lib.json5
@@ -199,18 +199,14 @@
         "MIMXRT105X": {
             "mem-size": 36560
         },
-        "PORTENTA_H7": {
+        "STM32H747_ARDUINO": {
             "mem-size": 16000
         },
         "FVP_MPS2_M3": {
             "mem-size": 36560
         },
         "MTS_DRAGONFLY_F411RE": {
             "tcpip-thread-stacksize": 1600
-        },
-        "STM32H7": {
-            // On STM32H7, we have lots of RAM, so we can make the pool size relatively large
-            "pbuf-pool-size": 16,
         }
     }
 }
diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(mbed-core-flags
         .
         ./include
         ./include/drivers
-        ./include/drivers/internal
+        ./include/drivers/interfaces
 )
 
 target_sources(mbed-core-sources

diff --git a/features/frameworks/cy_rtos_rtx_adapter/CMakeLists.txt b/features/frameworks/cy_rtos_rtx_adapter/CMakeLists.txt
@@ -19,6 +19,6 @@ else()
 	# Build as part of the minimal CyHAL if it's enabled
 	if(TARGET mbed-minimal-cyhal)
 		target_sources(mbed-minimal-cyhal PRIVATE ${CY_RTOS_RTX_ADAPTER_SOURCES})
-		target_include_directories(mbed-minimal-cyhal INTERFACE ${CY_RTOS_RTX_ADAPTER_INCLUDE_DIRS})
+		target_include_directories(mbed-minimal-cyhal PUBLIC ${CY_RTOS_RTX_ADAPTER_INCLUDE_DIRS})
 	endif()
 endif()
diff --git a/...blockdevice/COMPONENT_QSPIF/mbed_lib.json → ...lockdevice/COMPONENT_QSPIF/mbed_lib.json5 b/...blockdevice/COMPONENT_QSPIF/mbed_lib.json → ...lockdevice/COMPONENT_QSPIF/mbed_lib.json5
@@ -54,6 +54,12 @@
         "MCU_LPC546XX": {
             "QSPI_MIN_READ_SIZE": "4",
             "QSPI_MIN_PROG_SIZE": "4"
+        },
+        "ARDUINO_GIGA": {
+            "QSPI_POLARITY_MODE": "QSPIF_POLARITY_MODE_1",
+            // The flash on this board (AT25SF128A) is quite old and does not have reset information in its
+            // SFDP table.
+            "enable-and-reset": true
         }
     }
 }
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747_ARDUINO/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747_ARDUINO/CMakeLists.txt
@@ -8,4 +8,5 @@ target_link_libraries(mbed-stm32h747-arduino INTERFACE mbed-stm32h747xi-cm7)
 target_sources(mbed-stm32h747-arduino INTERFACE
 	PeripheralPins.c)
 
-add_subdirectory(TARGET_ARDUINO_PORTENTA_H7)
+add_subdirectory(TARGET_ARDUINO_PORTENTA_H7)
+add_subdirectory(TARGET_ARDUINO_GIGA)
diff --git a/...ET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747_ARDUINO/TARGET_ARDUINO_GIGA/CMakeLists.txt b/...ET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747_ARDUINO/TARGET_ARDUINO_GIGA/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_library(mbed-arduino-giga-cm7 INTERFACE)
+
+target_include_directories(mbed-arduino-giga-cm7
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-arduino-giga-cm7 INTERFACE mbed-stm32h747-arduino)