ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mbed LPC1768 & Xpresso LPC1769 unified 

Target of LPC1769 links to mbed LPC1768.
The PinNames.h has conditional compile for the pin names.
LWIP lpc17xx emac driver modified to allow LPC1769 target
pull/5025/head
Piotr Grygorczuk 2017-09-06 16:12:40 +01:00
parent 9c77957798
commit 728a3a4a76
7 changed files with 52 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c
View File

@ -63,6 +63,12 @@
* @{
*/
#if defined(TARGET_LPC1768) || defined(TARGET_LPC1769)
/** \brief Group LPC17xx processors into one definition
*/
#define TARGET_LPC17XX
#endif
#if NO_SYS == 0
/** \brief Driver transmit and receive thread priorities
*
@ -146,7 +152,7 @@ struct lpc_enetdata {
# else
# define ETHMEM_SECTION __attribute__((section("AHBSRAM1"),aligned))
# endif
#elif defined(TARGET_LPC1768)
#elif defined(TARGET_LPC17XX)
# if defined(TOOLCHAIN_GCC_ARM)
# define ETHMEM_SECTION __attribute__((section("AHBSRAM1"),aligned))
# endif
@ -370,7 +376,7 @@ static struct pbuf *lpc_low_level_input(struct netif *netif)
LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE,
("lpc_low_level_input: Packet index %"U32_F" dropped for OOM\n",
idx));
#ifdef LOCK_RX_THREAD
#if NO_SYS == 0
sys_mutex_unlock(&lpc_enetif->TXLockMutex);
@ -428,7 +434,7 @@ void lpc_enetif_input(struct netif *netif)
*/
static s32_t lpc_packet_addr_notsafe(void *addr) {
/* Check for legal address ranges */
#if defined(TARGET_LPC1768)
#if defined(TARGET_LPC17XX)
if ((((u32_t) addr >= 0x2007C000) && ((u32_t) addr < 0x20083FFF))) {
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
if ((((u32_t) addr >= 0x20000000) && ((u32_t) addr < 0x20007FFF))) {
@ -790,7 +796,7 @@ static err_t low_level_init(struct netif *netif)
/* Enable MII clocking */
LPC_SC->PCONP |= CLKPWR_PCONP_PCENET;
#if defined(TARGET_LPC1768)
#if defined(TARGET_LPC17XX)
LPC_PINCON->PINSEL2 = 0x50150105; /* Enable P1 Ethernet Pins. */
LPC_PINCON->PINSEL3 = (LPC_PINCON->PINSEL3 & ~0x0000000F) | 0x00000005;
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)

36
targets/TARGET_NXP/TARGET_LPC176X/TARGET_MBED_LPC1768/PinNames.h
View File

@ -55,6 +55,32 @@ typedef enum {
p18 = P0_26,
p19 = P1_30,
p20 = P1_31,
#if defined(TARGET_LPC1769)
p21 = P0_2,
p22 = P0_3,
p23 = P0_21,
p24 = P0_22,
p25 = P0_27,
p26 = P0_28,
p27 = P2_13,
p38 = P0_4,
p39 = P0_5,
p40 = P0_10,
p41 = P0_11,
p42 = P2_0,
p43 = P2_1,
p44 = P2_2,
p45 = P2_3,
p46 = P2_4,
p47 = P2_5,
p48 = P2_6,
p49 = P2_7,
p50 = P2_8,
p51 = P2_10,
p52 = P2_11,
p53 = P2_12,
#else
p21 = P2_5,
p22 = P2_4,
p23 = P2_3,
@ -65,6 +91,7 @@ typedef enum {
p28 = P0_10,
p29 = P0_5,
p30 = P0_4,
#endif
// Other mbed Pin Names
#ifdef MCB1700
@ -72,6 +99,11 @@ typedef enum {
LED2 = P1_29,
LED3 = P1_31,
LED4 = P2_2,
#elif defined(TARGET_LPC1769)
LED1 = P0_22,
LED2 = P0_22,
LED3 = P0_22,
LED4 = P0_22,
#else
LED1 = P1_18,
LED2 = P1_20,
@ -113,8 +145,8 @@ typedef enum {
I2C_SDA0 = NC,
I2C_SCL1 = p10,
I2C_SDA1 = p9,
I2C_SCL2 = p27, // pin used by application board
I2C_SDA2 = p28, // pin used by application board
I2C_SCL2 = P0_11, // pin used by application board
I2C_SDA2 = P0_10, // pin used by application board
I2C_SCL = I2C_SCL2,
I2C_SDA = I2C_SDA2,
} PinName;

136
targets/TARGET_NXP/TARGET_LPC176X/TARGET_XPRESSO_LPC1769/PinNames.h
View File

@ -1,136 +0,0 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2013 ARM Limited
*
* 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.
*/
#ifndef MBED_PINNAMES_H
#define MBED_PINNAMES_H
#include "cmsis.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef enum {
PIN_INPUT,
PIN_OUTPUT
} PinDirection;
#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 = P0_2,
p22 = P0_3,
p23 = P0_21,
p24 = P0_22,
p25 = P0_27,
p26 = P0_28,
p27 = P2_13,
p38 = P0_4,
p39 = P0_5,
p40 = P0_10,
p41 = P0_11,
p42 = P2_0,
p43 = P2_1,
p44 = P2_2,
p45 = P2_3,
p46 = P2_4,
p47 = P2_5,
p48 = P2_6,
p49 = P2_7,
p50 = P2_8,
p51 = P2_10,
p52 = P2_11,
p53 = P2_12,
// Other mbed Pin Names
LED1 = P0_22,
LED2 = P0_22,
LED3 = P0_22,
LED4 = P0_22,
USBTX = p21,
USBRX = p22,
A0 = P0_23,
A1 = P0_24,
A2 = P0_25,
A3 = P0_26,
A4 = P1_30,
A5 = P1_31,
// Not connected
NC = (int)0xFFFFFFFF,
I2C_SCL0 = NC,
I2C_SDA0 = NC,
I2C_SCL1 = p10,
I2C_SDA1 = p9,
I2C_SCL2 = p41, // pin used by application board
I2C_SDA2 = p40, // pin used by application board
I2C_SCL = I2C_SCL2,
I2C_SDA = I2C_SDA2,
} PinName;
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

70
targets/TARGET_NXP/TARGET_LPC176X/TARGET_XPRESSO_LPC1769/device.h
View File

@ -1,70 +0,0 @@
// The 'features' section in 'target.json' is now used to create the device's hardware preprocessor switches.
// Check the 'features' section of the target description in 'targets.json' for more details.
/* mbed Microcontroller Library
* Copyright (c) 2006-2013 ARM Limited
*
* 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.
*/
#ifndef MBED_DEVICE_H
#define MBED_DEVICE_H
#define DEVICE_ID_LENGTH 32
#define DEVICE_MAC_OFFSET 20
// #define DEVICE_PORTIN 1
// #define DEVICE_PORTOUT 1
// #define DEVICE_PORTINOUT 1
// #define DEVICE_INTERRUPTIN 0
// #define DEVICE_ANALOGIN 0
// #define DEVICE_ANALOGOUT 0
// #define DEVICE_SERIAL 1
// #define DEVICE_I2C 0
// #define DEVICE_I2CSLAVE 0
// #define DEVICE_SPI 0
// #define DEVICE_SPISLAVE 0
// #define DEVICE_CAN 0
// #define DEVICE_RTC 0
// #define DEVICE_ETHERNET 0
// #define DEVICE_PWMOUT 0
// #define DEVICE_SEMIHOST 0
// #define DEVICE_LOCALFILESYSTEM 0
// #define DEVICE_SLEEP 1
// #ifdef DEVICE_DEBUG_AWARENESS
// #undef DEVICE_DEBUG_AWARENESS
// #define DEVICE_DEBUG_AWARENESS 0
// #endif
// #define DEVICE_STDIO_MESSAGES 0
// #define DEVICE_ERROR_PATTERN 0
#include "objects.h"
#endif

8
targets/TARGET_NXP/TARGET_LPC176X/TARGET_XPRESSO_LPC1769/reserved_pins.h
View File

@ -1,8 +0,0 @@
// List of reserved pins for MBED LPC1768
#ifndef RESERVED_PINS_H
#define RESERVED_PINS_H
#define TARGET_RESERVED_PINS {}
#endif

9
targets/targets.json
View File

@ -246,11 +246,12 @@
"LPC1769": {
"inherits": ["LPCTarget"],
"core": "Cortex-M3",
"extra_labels": ["NXP", "LPC176X", "XPRESSO_LPC1769"],
"supported_toolchains": ["GCC_ARM", "IAR"],
"extra_labels": ["NXP", "LPC176X", "MBED_LPC1768"],
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
"detect_code": ["1010"],
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"release_versions": ["5"],
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOCALFILESYSTEM", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SEMIHOST", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"release_versions": ["2", "5"],
"features": ["LWIP"],
"device_name": "LPC1769"
},
"ARCH_PRO": {

3
tools/export/iar/iar_definitions.json
View File

@ -104,6 +104,9 @@
"LPC1768": {
"OGChipSelectEditMenu": "LPC1768\tNXP LPC1768"
},
"LPC1769": {
"OGChipSelectEditMenu": "LPC1769\tNXP LPC1769"
},
"STM32F446RE": {
"OGChipSelectEditMenu": "STM32F446RE\tST STM32F446RE"
},