From 958247265b8c009a2c0d85a3aff52b677951764b Mon Sep 17 00:00:00 2001 From: Kevin Bracey Date: Mon, 15 Jan 2018 16:05:07 +0200 Subject: [PATCH] Tell mbed build to ignore old lwIP+EMAC drivers --- features/FEATURE_LWIP/lwip-interface/.mbedignore | 1 + features/FEATURE_LWIP/lwip-interface/lwip-eth/README | 3 +++ features/FEATURE_LWIP/lwip-interface/lwipopts.h | 4 ---- features/FEATURE_LWIP/lwip-interface/mbed_lib.json | 6 ++++++ targets/targets.json | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 features/FEATURE_LWIP/lwip-interface/lwip-eth/README diff --git a/features/FEATURE_LWIP/lwip-interface/.mbedignore b/features/FEATURE_LWIP/lwip-interface/.mbedignore index e12200526f..30bc847cb5 100644 --- a/features/FEATURE_LWIP/lwip-interface/.mbedignore +++ b/features/FEATURE_LWIP/lwip-interface/.mbedignore @@ -4,3 +4,4 @@ lwip/src/apps/* lwip/src/netif/lwip_slipif.c lwip/src/include/lwip/apps/* lwip/src/include/posix/* +lwip-eth/* diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/README b/features/FEATURE_LWIP/lwip-interface/lwip-eth/README new file mode 100644 index 0000000000..4f25a4ece0 --- /dev/null +++ b/features/FEATURE_LWIP/lwip-interface/lwip-eth/README @@ -0,0 +1,3 @@ +This directory contains lwIP drivers that are no longer built. Any drivers +remaining here must be convered to use the EMAC interface, and moved to +features/netsocket/emac-drivers. diff --git a/features/FEATURE_LWIP/lwip-interface/lwipopts.h b/features/FEATURE_LWIP/lwip-interface/lwipopts.h index a48711632b..7b7d86aa62 100644 --- a/features/FEATURE_LWIP/lwip-interface/lwipopts.h +++ b/features/FEATURE_LWIP/lwip-interface/lwipopts.h @@ -19,10 +19,6 @@ #ifndef LWIPOPTS_H #define LWIPOPTS_H -#if MBED_CONF_LWIP_ETHERNET_ENABLED -#include "lwipopts_conf.h" -#endif - // Workaround for Linux timeval #if defined (TOOLCHAIN_GCC) #define LWIP_TIMEVAL_PRIVATE 0 diff --git a/features/FEATURE_LWIP/lwip-interface/mbed_lib.json b/features/FEATURE_LWIP/lwip-interface/mbed_lib.json index 6d9def2aa1..741bd05634 100644 --- a/features/FEATURE_LWIP/lwip-interface/mbed_lib.json +++ b/features/FEATURE_LWIP/lwip-interface/mbed_lib.json @@ -100,6 +100,12 @@ "target_overrides": { "REALTEK_RTL8195AM": { "tcpip-thread-stacksize": 1600 + }, + "STM": { + "mem-size": 25600 + }, + "Freescale": { + "mem-size": 36560 } } } diff --git a/targets/targets.json b/targets/targets.json index afa45169e8..14ada9407f 100755 --- a/targets/targets.json +++ b/targets/targets.json @@ -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", "EMAC", "TRNG", "FLASH"], + "device_has_add": ["CAN", "TRNG", "FLASH"], "device_has_remove": ["RTC", "SLEEP"], "features": ["LWIP"], "device_name": "STM32F439ZI", @@ -3859,7 +3859,7 @@ "extra_labels": ["Realtek", "AMEBA", "RTL8195A"], "macros": ["__RTL8195A__","CONFIG_PLATFORM_8195A","CONFIG_MBED_ENABLED","PLATFORM_CMSIS_RTOS","MBED_FAULT_HANDLER_DISABLED"], "supported_toolchains": ["GCC_ARM", "ARM", "IAR"], - "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SPI", "TRNG", "EMAC", "FLASH"], + "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SPI", "TRNG", "FLASH"], "features": ["LWIP"], "post_binary_hook": { "function": "RTL8195ACode.binary_hook",