add LPCXresso LPC1769 target

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

@@ -120,15 +120,9 @@ 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))
+#     define ETHMEM_SECTION __attribute__((section("AHBSRAM"), aligned(32)))
 #  endif
 #endif
 
@@ -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 → targets/TARGET_NXP/TARGET_LPC17XX/CMakeLists.txt

@@ -3,8 +3,9 @@
 
 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)
@@ -14,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
@@ -45,7 +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-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})

targets/TARGET_NXP/TARGET_LPC176X/TARGET_ARCH_PRO/CMakeLists.txt → targets/TARGET_NXP/TARGET_LPC17XX/TARGET_ARCH_PRO/CMakeLists.txt

@@ -10,6 +10,6 @@ target_include_directories(mbed-arch-pro
         .
 )
 
-target_link_libraries(mbed-arch-pro INTERFACE mbed-lpc176x)
+target_link_libraries(mbed-arch-pro INTERFACE mbed-lpc17xx)
 
 mbed_post_build_lpc_patch_vtable("ARCH_PRO")

targets/TARGET_NXP/TARGET_LPC17XX/TARGET_LPCXPRESSO_LPC1769/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+include(mbed_set_post_build_nxp)
+
+add_library(mbed-lpcxpresso-lpc1769 INTERFACE)
+
+target_include_directories(mbed-lpcxpresso-lpc1769
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-lpcxpresso-lpc1769 INTERFACE mbed-lpc17xx)
+
+mbed_post_build_lpc_patch_vtable("LPC1768")

targets/TARGET_NXP/TARGET_LPC17XX/TARGET_LPCXPRESSO_LPC1769/PinNames.h

@@ -0,0 +1,150 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* MBED TARGET LIST: LPC1768 */
+
+#ifndef MBED_PINNAMES_H
+#define MBED_PINNAMES_H
+
+#include "cmsis.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    PIN_INPUT,
+    PIN_OUTPUT
+} PinDirection;
+
+/* If this macro is defined, you can use constexpr utility functions for pin map search. */
+#define STATIC_PINMAP_READY 1
+
+#define PORT_SHIFT  5
+
+typedef enum {
+    // LPC Pin Names
+    P0_0 = LPC_GPIO0_BASE,
+          P0_1, P0_2, P0_3, P0_4, P0_5, P0_6, P0_7, P0_8, P0_9, P0_10, P0_11, P0_12, P0_13, P0_14, P0_15, P0_16, P0_17, P0_18, P0_19, P0_20, P0_21, P0_22, P0_23, P0_24, P0_25, P0_26, P0_27, P0_28, P0_29, P0_30, P0_31,
+    P1_0, P1_1, P1_2, P1_3, P1_4, P1_5, P1_6, P1_7, P1_8, P1_9, P1_10, P1_11, P1_12, P1_13, P1_14, P1_15, P1_16, P1_17, P1_18, P1_19, P1_20, P1_21, P1_22, P1_23, P1_24, P1_25, P1_26, P1_27, P1_28, P1_29, P1_30, P1_31,
+    P2_0, P2_1, P2_2, P2_3, P2_4, P2_5, P2_6, P2_7, P2_8, P2_9, P2_10, P2_11, P2_12, P2_13, P2_14, P2_15, P2_16, P2_17, P2_18, P2_19, P2_20, P2_21, P2_22, P2_23, P2_24, P2_25, P2_26, P2_27, P2_28, P2_29, P2_30, P2_31,
+    P3_0, P3_1, P3_2, P3_3, P3_4, P3_5, P3_6, P3_7, P3_8, P3_9, P3_10, P3_11, P3_12, P3_13, P3_14, P3_15, P3_16, P3_17, P3_18, P3_19, P3_20, P3_21, P3_22, P3_23, P3_24, P3_25, P3_26, P3_27, P3_28, P3_29, P3_30, P3_31,
+    P4_0, P4_1, P4_2, P4_3, P4_4, P4_5, P4_6, P4_7, P4_8, P4_9, P4_10, P4_11, P4_12, P4_13, P4_14, P4_15, P4_16, P4_17, P4_18, P4_19, P4_20, P4_21, P4_22, P4_23, P4_24, P4_25, P4_26, P4_27, P4_28, P4_29, P4_30, P4_31,
+
+    // mbed DIP Pin Names
+    p5 = P0_9,
+    p6 = P0_8,
+    p7 = P0_7,
+    p8 = P0_6,
+    p9 = P0_0,
+    p10 = P0_1,
+    p11 = P0_18,
+    p12 = P0_17,
+    p13 = P0_15,
+    p14 = P0_16,
+    p15 = P0_23,
+    p16 = P0_24,
+    p17 = P0_25,
+    p18 = P0_26,
+    p19 = P1_30,
+    p20 = P1_31,
+    p21 = P2_5,
+    p22 = P2_4,
+    p23 = P2_3,
+    p24 = P2_2,
+    p25 = P2_1,
+    p26 = P2_0,
+    p27 = P0_11,
+    p28 = P0_10,
+    p29 = P0_5,
+    p30 = P0_4,
+
+    CONSOLE_TX = P0_2,
+    CONSOLE_RX = P0_3,
+
+    // Arch Pro Pin Names
+    D0 = P4_29,
+    D1 = P4_28,
+    D2 = P0_4,
+    D3 = P0_5,
+    D4 = P2_2,
+    D5 = P2_3,
+    D6 = P2_4,
+    D7 = P2_5,
+    D8 = P0_0,
+    D9 = P0_1,
+    D10 = P0_6,
+    D11 = P0_9,
+    D12 = P0_8,
+    D13 = P0_7,
+    D14 = P0_27,
+    D15 = P0_28,
+
+    A0 = P0_23,
+    A1 = P0_24,
+    A2 = P0_25,
+    A3 = P0_26,
+    A4 = P1_30,
+    A5 = P1_31,
+
+    // Not connected
+    NC = (int)0xFFFFFFFF
+} PinName;
+
+// Standard buttons and LEDs
+#define LED1 P0_22  // LED1 RGB red
+#define LED2 P3_26  // LED1 RGB blue
+#define LED3 P2_25  // LED1 RGB green
+
+#define LED_RED   LED1
+#define LED_BLUE  LED2
+#define LED_GREEN LED3
+
+// I2C pin names
+#define I2C_SCL0 P0_28  // ext. pull-up 2k2 onboard
+#define I2C_SDA0 P0_27  // ext. pull-up 2k2 onboard
+#define I2C_SCL1 p10
+#define I2C_SDA1 p9
+#define I2C_SCL2 P0_11
+#define I2C_SDA2 P0_10
+#define I2C_SCL I2C_SCL0
+#define I2C_SDA I2C_SDA0
+
+typedef enum {
+    PullUp = 0,
+    PullDown = 3,
+    PullNone = 2,
+    Repeater = 1,
+    OpenDrain = 4,
+    PullDefault = PullDown
+} PinMode;
+
+// version of PINCON_TypeDef using register arrays
+typedef struct {
+  __IO uint32_t PINSEL[11];
+       uint32_t RESERVED0[5];
+  __IO uint32_t PINMODE[10];
+  __IO uint32_t PINMODE_OD[5];
+} PINCONARRAY_TypeDef;
+
+#define PINCONARRAY ((PINCONARRAY_TypeDef *)LPC_PINCON_BASE)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif