From ef68eb8b4dc26cec6d855c63ac988edd993c2115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= Date: Thu, 8 Feb 2018 13:32:26 +0200 Subject: [PATCH] Enabled greentea and mbed-os-example-tls/client/sockets test for STM --- .../sdk/wifi_emac/.mbedignore | 3 +-- targets/targets.json | 20 +++++++++---------- tools/test/examples/examples.json | 10 +++++++--- tools/test_configs/target_configs.json | 4 ++-- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/wifi_emac/.mbedignore b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/wifi_emac/.mbedignore index ece49e4227..72e8ffc0db 100644 --- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/wifi_emac/.mbedignore +++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/wifi_emac/.mbedignore @@ -1,2 +1 @@ -wifi_emac_api.cpp -wifi_emac_api.h +* diff --git a/targets/targets.json b/targets/targets.json index 14ada9407f..3b0f60386c 100755 --- a/targets/targets.json +++ b/targets/targets.json @@ -928,7 +928,7 @@ }, "detect_code": ["0835"], "macros_add": ["USBHOST_OTHER"], - "device_has_add": ["ANALOGOUT", "CAN", "SERIAL_ASYNCH", "SERIAL_FC", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "SERIAL_ASYNCH", "SERIAL_FC", "FLASH"], "features": ["LWIP"], "release_versions": ["2", "5"], "device_name": "STM32F207ZG" @@ -1241,7 +1241,7 @@ }, "extra_labels_add": ["STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx", "STM32F429xI"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH"], "detect_code": ["0796"], "features": ["LWIP"], "release_versions": ["2", "5"], @@ -1271,7 +1271,7 @@ }, "extra_labels_add": ["STM32F4", "STM32F439", "STM32F439ZI", "STM32F439xx", "STM32F439xI"], "macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT", "USB_STM_HAL", "USBHOST_OTHER"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_FC", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_FC", "TRNG", "FLASH"], "detect_code": ["0797"], "features": ["LWIP"], "release_versions": ["2", "5"], @@ -1348,7 +1348,7 @@ "macros_add": ["USBHOST_OTHER"], "supported_form_factors": ["ARDUINO"], "detect_code": ["0816"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], "features": ["LWIP"], "release_versions": ["2", "5"], "device_name": "STM32F746ZG", @@ -1377,7 +1377,7 @@ "macros_add": ["TRANSACTION_QUEUE_SIZE_SPI=2", "USBHOST_OTHER", "MBEDTLS_CONFIG_HW_SUPPORT"], "supported_form_factors": ["ARDUINO"], "detect_code": ["0819"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], "features": ["LWIP"], "release_versions": ["2", "5"], "device_name": "STM32F756ZG" @@ -1405,7 +1405,7 @@ "supported_form_factors": ["ARDUINO"], "macros_add": ["USBHOST_OTHER"], "detect_code": ["0818"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], "features": ["LWIP"], "release_versions": ["2", "5"], "device_name": "STM32F767ZI", @@ -1866,7 +1866,7 @@ }, "detect_code": ["0815"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], "features": ["LWIP"], "release_versions": ["2", "5"], "device_name": "STM32F746NG" @@ -1889,7 +1889,7 @@ }, "detect_code": ["0817"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], - "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "CAN", "EMAC", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"], "features": ["LWIP"], "release_versions": ["2", "5"], "device_name": "STM32F769NI" @@ -2096,7 +2096,7 @@ "core": "Cortex-M4F", "extra_labels_add": ["STM32F4", "STM32F439", "STM32F439ZI","STM32F439xx", "STM32F439xI"], "macros": ["MBEDTLS_CONFIG_HW_SUPPORT", "HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_ARC4_C","MBEDTLS_DES_C","MBEDTLS_MD4_C","MBEDTLS_MD5_C","MBEDTLS_SHA1_C"], - "device_has_add": ["CAN", "TRNG", "FLASH"], + "device_has_add": ["CAN", "EMAC", "TRNG", "FLASH"], "device_has_remove": ["RTC", "SLEEP"], "features": ["LWIP"], "device_name": "STM32F439ZI", @@ -2160,7 +2160,7 @@ }, "macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT", "HSE_VALUE=12000000", "GNSSBAUD=9600"], "overrides": {"lse_available": 0}, - "device_has_add": ["ANALOGOUT", "SERIAL_FC", "TRNG", "FLASH"], + "device_has_add": ["ANALOGOUT", "EMAC", "SERIAL_FC", "TRNG", "FLASH"], "features": ["LWIP"], "public": false, "device_name": "STM32F437VG", diff --git a/tools/test/examples/examples.json b/tools/test/examples/examples.json index 0ee59060c1..2dc4428ab3 100644 --- a/tools/test/examples/examples.json +++ b/tools/test/examples/examples.json @@ -26,7 +26,7 @@ ], "test-repo-source": "mbed", "features" : [], - "targets" : ["K64F"], + "targets" : ["K64F", "NUCLEO_F429ZI"], "toolchains" : ["GCC_ARM", "ARM"], "exporters": [], "compile" : true, @@ -81,7 +81,9 @@ ], "test-repo-source": "github", "features" : ["LWIP"], - "targets" : ["K64F", "K66F"], + "targets" : ["K64F", "K66F", "NUCLEO_F207ZG", "NUCLEO_F429ZI", "NUCLEO_F439ZI", + "NUCLEO_F746ZG", "NUCLEO_F756ZG", "NUCLEO_F767ZI", "DISCO_F746NG", + "DISCO_F769NI", "UBLOX_EVK_ODIN_W2", "UBLOX_C030"], "toolchains" : [], "exporters": [], "compile" : false, @@ -95,7 +97,9 @@ ], "test-repo-source": "github", "features" : ["LWIP"], - "targets" : ["K64F", "K66F"], + "targets" : ["K64F", "K66F", "NUCLEO_F207ZG", "NUCLEO_F429ZI", "NUCLEO_F439ZI", + "NUCLEO_F746ZG", "NUCLEO_F756ZG", "NUCLEO_F767ZI", "DISCO_F746NG", + "DISCO_F769NI", "UBLOX_EVK_ODIN_W2", "UBLOX_C030"], "toolchains" : [], "exporters": [], "compile" : true, diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json index b2c9ff9f0d..c25c546faa 100644 --- a/tools/test_configs/target_configs.json +++ b/tools/test_configs/target_configs.json @@ -12,7 +12,7 @@ "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "ESP8266_WIFI", "ETHERNET"] }, "NUCLEO_F429ZI": { - "default_test_configuration": "HEAPBLOCKDEVICE", - "test_configurations": ["HEAPBLOCKDEVICE"] + "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET", + "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"] } }