Skip to content

Commit 5b67832

Browse files
authored
Merge pull request #3054 from andreaslarssonublox/ublox_fix_odin_mbedtls_config
Moved mbedtls config for u-blox ODIN-W2 to macros in target.json
2 parents ff2a7db + cb113d7 commit 5b67832

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

targets/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@
12721272
"default_toolchain": "ARM",
12731273
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
12741274
"extra_labels": ["STM", "STM32F4", "STM32F439", "STM32F439ZI","STM32F439xx"],
1275-
"macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_USER_CONFIG_FILE=\"sdk/odin_w2_mbedtls_config.h\""],
1275+
"macros": ["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"],
12761276
"inherits": ["Target"],
12771277
"device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG"],
12781278
"features": ["LWIP"],

0 commit comments

Comments
 (0)