From cb113d738eacbfe18da111c434e7c5ac140ec54e Mon Sep 17 00:00:00 2001 From: "andreas.larsson" Date: Tue, 18 Oct 2016 01:07:48 +0200 Subject: [PATCH] Moved mbedtls config for u-blox ODIN-W2 to macros in target.json --- .../sdk/odin_w2_mbedtls_config.h | 10 ---------- targets/targets.json | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h deleted file mode 100644 index 926f23b304..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _ODIN_W2_MBEDTLS_CONFIG_H_ -#define _ODIN_W2_MBEDTLS_CONFIG_H_ - -#define MBEDTLS_ARC4_C -#define MBEDTLS_DES_C -#define MBEDTLS_MD4_C -#define MBEDTLS_MD5_C -#define MBEDTLS_SHA1_C - -#endif /* _ODIN_W2_MBEDTLS_CONFIG_H_ */ diff --git a/targets/targets.json b/targets/targets.json index 8ae47e5e42..d6ebadd585 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -1259,7 +1259,7 @@ "default_toolchain": "ARM", "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"], "extra_labels": ["STM", "STM32F4", "STM32F439", "STM32F439ZI","STM32F439xx"], - "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\""], + "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"], "inherits": ["Target"], "device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG"], "features": ["LWIP"],