fix rebase conflict

Author: JojoS62

connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_LPCTarget/lpc17_emac.cpp

@@ -120,12 +120,6 @@ struct lpc_enetdata {
     uint32_t lpc_reserved_tx_num; /**< Number of reserved TX descriptors, zero-copy mode */
 };
 
-#if defined(TARGET_LPC1768)
-/** \brief Group LPC17xx processors into one definition
- */
-#define TARGET_LPC17XX
-#endif
-
 #if defined(TARGET_LPC17XX)
 #  if defined(TOOLCHAIN_GCC_ARM) || defined(TOOLCHAIN_ARM)
 #     define ETHMEM_SECTION __attribute__((section("AHBSRAM"), aligned(32)))
@@ -385,9 +379,9 @@ int32_t LPC17_EMAC::lpc_packet_addr_notsafe(void *addr)
     /* Check for legal address ranges */
 #if defined(TARGET_LPC17XX)
     if ((((uint32_t) addr >= 0x2007C000) && ((uint32_t) addr < 0x20083FFF))) {
-#endif
         return 0;
     }
+#endif
     return 1;
 }
 

connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_LPCTarget/lpc_emac_config.h

@@ -6,7 +6,7 @@
 * @version	1.0
 * @date		20 Nov. 2011
 * @author	NXP MCU SW Application Team
-* 
+*
 * Copyright(C) 2011, NXP Semiconductor
 * All rights reserved.
 *
@@ -61,7 +61,7 @@
  */
 #define PHY_USE_100MBS 1 /**< Sets data rate to 100Mbps. */
 
-/**		  
+/**
  * @}
  */
 
@@ -95,7 +95,7 @@
  */
 #define LPC_TX_PBUF_BOUNCE_EN 1
 
-/**		  
+/**
  * @}
  */
 

connectivity/lwipstack/lwip-sys/arch/cc.h

@@ -131,14 +131,8 @@ void trace_to_ascii_hex_dump(char* prefix, int len, char *data);
 
 /* Define the memory area for the lwip's memory pools */
 #ifndef MEMP_SECTION
-#if defined(TARGET_LPC1768)
-#  if defined (__ICCARM__)
-#     define MEMP_SECTION
-#  elif defined(TOOLCHAIN_GCC_CR)
-#     define MEMP_SECTION __attribute__((section(".data.$RamPeriph32")))
-#  else
-#     define MEMP_SECTION __attribute__((section("AHBSRAM"),aligned))
-#  endif
+#if defined(TARGET_LPC17XX)
+#   define MEMP_SECTION __attribute__((section("AHBSRAM"),aligned))
 #endif
 #endif
 

connectivity/lwipstack/lwip-sys/arch/lwip_sys_arch.c

@@ -31,20 +31,10 @@
 
 /* Define the heap ourselves to give us section placement control */
 #ifndef ETHMEM_SECTION
-#if defined(TARGET_LPC1768)
-#  if defined (__ICCARM__)
-#     define ETHMEM_SECTION
-#  elif defined(TOOLCHAIN_GCC_CR)
-#     define ETHMEM_SECTION __attribute__((section(".data.$RamPeriph32")))
-#  else
-#     define ETHMEM_SECTION __attribute__((section("AHBSRAM"),aligned))
-#  endif
+#if defined(TARGET_LPC17XX)
+#   define ETHMEM_SECTION __attribute__((section("AHBSRAM"),aligned))
 #elif defined(TARGET_STM32H7)
-#  if defined (__ICCARM__)
-#     define ETHMEM_SECTION
-#  else
-#     define ETHMEM_SECTION __attribute__((section(".ethusbram")))
-#  endif
+#   define ETHMEM_SECTION __attribute__((section(".ethusbram")))
 #else
 #define ETHMEM_SECTION
 #endif
@@ -65,9 +55,6 @@ struct mem {
 #define SIZEOF_STRUCT_MEM    LWIP_MEM_ALIGN_SIZE(sizeof(struct mem))
 #define MEM_SIZE_ALIGNED     LWIP_MEM_ALIGN_SIZE(MEM_SIZE)
 
-#if defined (__ICCARM__)
-#pragma location = ".ethusbram"
-#endif
 LWIP_DECLARE_MEMORY_ALIGNED(lwip_ram_heap, MEM_SIZE_ALIGNED + (2U*SIZEOF_STRUCT_MEM)) ETHMEM_SECTION;
 
  #if NO_SYS==1
@@ -320,7 +307,7 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count) {
     sem->id = osSemaphoreNew(UINT16_MAX, count, &sem->attr);
     if (sem->id == NULL)
         MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_sem_new create error\n", (u32_t)sem);
-    
+
     return ERR_OK;
 }
 
@@ -349,12 +336,12 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count) {
  *---------------------------------------------------------------------------*/
 u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout) {
     u32_t start = osKernelGetTickCount();
-    
+
     if (osSemaphoreAcquire(sem->id, (timeout != 0)?(timeout):(osWaitForever)) != osOK) {
         MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_TIME_OUT), "sys_arch_sem_wait time out\n", (u32_t)sem);
         return SYS_ARCH_TIMEOUT;
     }
-    
+
     return osKernelGetTickCount() - start;
 }
 
@@ -394,7 +381,7 @@ err_t sys_mutex_new(sys_mutex_t *mutex) {
         MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_mutex_new error\n", (u32_t)mutex);
         return ERR_MEM;
     }
-    
+
     return ERR_OK;
 }
 
@@ -521,7 +508,7 @@ static sys_thread_data_t thread_pool[SYS_THREAD_POOL_N];
  *---------------------------------------------------------------------------*/
 #ifndef MBED_TZ_DEFAULT_ACCESS
 #define MBED_TZ_DEFAULT_ACCESS   0
-#endif    
+#endif
 
  sys_thread_t sys_thread_new(const char *pcName,
                             void (*thread)(void *arg),
@@ -547,7 +534,7 @@ static sys_thread_data_t thread_pool[SYS_THREAD_POOL_N];
     t->id = osThreadNew((osThreadFunc_t)thread, arg, &t->attr);
     if (t->id == NULL)
         MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_THREAD_CREATE_FAILED), "sys_thread_new create error\n");
-    
+
     return t;
 }
 

connectivity/lwipstack/mbed_lib.json5

@@ -169,6 +169,9 @@
         "LPC1768": {
             "mem-size": 16362
         },
+        "LPCXPRESSO_LPC1769": {
+            "mem-size": 16362
+        },
         "ARCH_PRO": {
             "mem-size": 16362
         },

targets/TARGET_NXP/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(TARGET_LPC11XX_11CXX EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_LPC176X EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_LPC17XX EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_MCUXpresso_MCUS EXCLUDE_FROM_ALL)
 
 add_library(mbed-nxp INTERFACE)

targets/TARGET_NXP/TARGET_LPC176X/CMakeLists.txt renamed to targets/TARGET_NXP/TARGET_LPC17XX/CMakeLists.txt

@@ -5,7 +5,7 @@ add_subdirectory(TARGET_ARCH_PRO EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_MBED_LPC1768 EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_LPCXPRESSO_LPC1769 EXCLUDE_FROM_ALL)
 
-add_library(mbed-lpc176x INTERFACE)
+add_library(mbed-lpc17xx INTERFACE)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_LPC17xx.S)
@@ -15,13 +15,13 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/LPC1768.ld)
 endif()
 
-target_include_directories(mbed-lpc176x
+target_include_directories(mbed-lpc17xx
     INTERFACE
         .
         device
 )
 
-target_sources(mbed-lpc176x
+target_sources(mbed-lpc17xx
     INTERFACE
         analogin_api.c
         analogout_api.c
@@ -46,8 +46,10 @@ target_sources(mbed-lpc176x
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-lpc176x INTERFACE mbed-nxp)
+target_link_libraries(mbed-lpc17xx INTERFACE mbed-nxp)
 
-mbed_set_linker_script(mbed-arch-pro ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-mbed_set_linker_script(mbed-lpc1768 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-mbed_set_linker_script(mbed-lpcxpresso-lpc1769 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-lpc17xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+# mbed_set_linker_script(mbed-arch-pro ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+# mbed_set_linker_script(mbed-lpc1768 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+# mbed_set_linker_script(mbed-lpcxpresso-lpc1769 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})