Skip to content

Commit b36cbfe

Browse files
0xc01700xc0170
committed
Merge pull request #894 from lindvalla/fix_lpc4088DM_target
Fix target issues for TARGET_LPC4088_DM
2 parents 8607b74 + dcc53f4 commit b36cbfe

File tree

25 files changed

+3741
-23
lines changed

25 files changed

+3741
-23
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ NXP:
3333
* LPC810 (Cortex-M0+)
3434
* [LPC812](http://developer.mbed.org/platforms/NXP-LPC800-MAX/) (Cortex-M0+)
3535
* [EA LPC4088](http://developer.mbed.org/platforms/EA-LPC4088/) (Cortex-M4F)
36+
* [EA LPC4088 DM](http://developer.mbed.org/platforms/EA-LPC4088-Display-Module/) (Cortex-M4F)
3637
* LPC4330 (Cortex-M4F + Cortex-M0)
3738
* [LPC1347](http://developer.mbed.org/platforms/DipCortex-M3/) (Cortex-M3)
3839
* [LPC1114](http://developer.mbed.org/platforms/LPC1114FN28/) (Cortex-M0)

‎libraries/USBDevice/USBDevice/USBEndpoints.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef enum {
3737
} EP_STATUS;
3838

3939
/* Include configuration for specific target */
40-
#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088)
40+
#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
4141
#include "USBEndpoints_LPC17_LPC23.h"
4242
#elif defined(TARGET_LPC11UXX) || defined(TARGET_LPC1347) || defined (TARGET_LPC11U6X) || defined (TARGET_LPC1549)
4343
#include "USBEndpoints_LPC11U.h"

‎libraries/USBDevice/USBDevice/USBHAL_LPC40.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1717
*/
1818

19-
#if defined(TARGET_LPC4088)
19+
#if defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
2020

2121
#include "USBHAL.h"
2222

‎libraries/net/eth/EthernetInterface/EthernetInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef ETHERNETINTERFACE_H_
2121
#define ETHERNETINTERFACE_H_
2222

23-
#if !defined(TARGET_LPC1768) && !defined(TARGET_LPC4088) && !defined(TARGET_K64F) && !defined(TARGET_RZ_A1H)
23+
#if !defined(TARGET_LPC1768) && !defined(TARGET_LPC4088) && !defined(TARGET_LPC4088_DM) && !defined(TARGET_K64F) && !defined(TARGET_RZ_A1H)
2424
#error The Ethernet Interface library is not supported on this target
2525
#endif
2626

‎libraries/net/eth/lwip-eth/arch/TARGET_NXP/lpc17_emac.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ struct lpc_enetdata {
134134
#endif
135135
};
136136

137-
#if defined(TARGET_LPC4088)
137+
#if defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
138138
# if defined (__ICCARM__)
139139
# define ETHMEM_SECTION
140140
# elif defined(TOOLCHAIN_GCC_CR)
@@ -444,7 +444,7 @@ static s32_t lpc_packet_addr_notsafe(void *addr) {
444444
/* Check for legal address ranges */
445445
#if defined(TARGET_LPC1768)
446446
if ((((u32_t) addr >= 0x2007C000) && ((u32_t) addr < 0x20083FFF))) {
447-
#elif defined(TARGET_LPC4088)
447+
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
448448
if ((((u32_t) addr >= 0x20000000) && ((u32_t) addr < 0x20007FFF))) {
449449
#endif
450450
return 0;
@@ -804,7 +804,7 @@ static err_t low_level_init(struct netif *netif)
804804
#if defined(TARGET_LPC1768)
805805
LPC_PINCON->PINSEL2 = 0x50150105; /* Enable P1 Ethernet Pins. */
806806
LPC_PINCON->PINSEL3 = (LPC_PINCON->PINSEL3 & ~0x0000000F) | 0x00000005;
807-
#elif defined(TARGET_LPC4088)
807+
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
808808
LPC_IOCON->P1_0 &= ~0x07; /* ENET I/O config */
809809
LPC_IOCON->P1_0 |= 0x01; /* ENET_TXD0 */
810810
LPC_IOCON->P1_1 &= ~0x07;

‎libraries/net/eth/lwip-eth/arch/TARGET_NXP/lwipopts_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#define LWIP_TRANSPORT_ETHERNET 1
2323

24-
#if defined(TARGET_LPC4088)
24+
#if defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
2525
#define MEM_SIZE 15360
2626
#elif defined(TARGET_LPC1768)
2727
#define MEM_SIZE 16362

‎libraries/net/lwip/lwip/core/mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ struct mem {
178178
* how that space is calculated). */
179179
#ifndef LWIP_RAM_HEAP_POINTER
180180

181-
#if defined(TARGET_LPC4088)
181+
#if defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
182182
# if defined (__ICCARM__)
183183
# define ETHMEM_SECTION
184184
# elif defined(TOOLCHAIN_GCC_CR)

‎libraries/net/lwip/lwip/core/memp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static u8_t *const memp_bases[] = {
168168

169169
#if defined(TARGET_LPC1768)
170170
# define ETHMEM_SECTION __attribute((section("AHBSRAM1")))
171-
#elif defined(TARGET_LPC4088) || defined(TARGET_K64F) || defined(TARGET_RZ_A1H)
171+
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM) || defined(TARGET_K64F) || defined(TARGET_RZ_A1H)
172172
# define ETHMEM_SECTION
173173
#endif
174174

‎libraries/rpc/parse_pins.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,18 @@ PinName parse_pins(const char *str) {
2727
, dp13, dp14, dp15, dp16, dp17, dp18, dp23
2828
, dp24, dp25, dp26, dp27, dp28};
2929
#elif defined(TARGET_LPC4088)
30-
static const PinName pin_names[] = {p5, p6, p7, p8, p9, p10, p11, p12, p13, p14
30+
static const PinName pin_names[] = {NC, NC, NC, NC, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14
3131
, p15, p16, p17, p18, p19, p20, NC, NC, p23
3232
, p24, p25, p26, p27, p28, p29, p30, p31, p32
33-
, p33, p34, NC, NC, p37, p38, p39};
33+
, p33, p34, NC, NC, p37, p38, p39, NC, NC, NC, NC, NC, NC, NC};
34+
#elif defined(TARGET_LPC4088_DM)
35+
static const PinName pin_names[] = {p1, p2, p3, p4, NC, NC, p7, p8, p9, p10, p11, p12, p13, p14
36+
, p15, p16, p17, p18, p19, p20, p21, p22, p23
37+
, p24, p25, p26, NC, NC, p29, p30, NC, NC
38+
, NC, NC, NC, NC, NC, NC, NC, NC, p41, p42, p43, p44, p45, p46};
3439
#endif
3540

36-
#if defined(TARGET_LPC1768) || defined(TARGET_LPC11U24) || defined(TARGET_LPC2368) || defined(TARGET_LPC812) || defined(TARGET_LPC4088)|| defined(TARGET_LPC1114)
41+
#if defined(TARGET_LPC1768) || defined(TARGET_LPC11U24) || defined(TARGET_LPC2368) || defined(TARGET_LPC812) || defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM) || defined(TARGET_LPC1114)
3742
if (str[0] == 'P') { // Pn_n
3843
uint32_t port = str[1] - '0';
3944
uint32_t pin = str[3] - '0'; // Pn_n
@@ -66,17 +71,17 @@ PinName parse_pins(const char *str) {
6671
return NC;
6772
}
6873
return pin_names[pin - 5];
69-
#elif defined(TARGET_LPC4088)
74+
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
7075
} else if (str[0] == 'p') { // pn
7176
uint32_t pin = str[1] - '0'; // pn
7277
uint32_t pin2 = str[2] - '0'; // pnn
7378
if (pin2 <= 9) {
7479
pin = pin * 10 + pin2;
7580
}
76-
if (pin < 5 || pin > 39) {
81+
if (pin < 1 || pin > 46) {
7782
return NC;
7883
}
79-
return pin_names[pin - 5];
84+
return pin_names[pin - 1];
8085
#endif
8186

8287
} else if (str[0] == 'L') { // LEDn

‎libraries/rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL}
235235
#elif defined(TARGET_KL05Z)
236236
#define INITIAL_SP (0x20000C00UL)
237237

238-
#elif defined(TARGET_LPC4088)
238+
#elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
239239
#define INITIAL_SP (0x10010000UL)
240240

241241
#elif defined(TARGET_LPC4330)

‎libraries/rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
// counting "main", but not counting "osTimerThread"
5050
// <i> Default: 6
5151
#ifndef OS_TASKCNT
52-
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC4330) || defined(TARGET_LPC4337) || defined(TARGET_LPC1347) || defined(TARGET_K64F) || defined(TARGET_STM32F401RE)\
52+
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM) || defined(TARGET_LPC4330) || defined(TARGET_LPC4337) || defined(TARGET_LPC1347) || defined(TARGET_K64F) || defined(TARGET_STM32F401RE)\
5353
|| defined(TARGET_KL46Z) || defined(TARGET_KL43Z) || defined(TARGET_STM32F407) || defined(TARGET_F407VG) || defined(TARGET_STM32F303VC) || defined(TARGET_LPC1549) || defined(TARGET_LPC11U68) \
5454
|| defined(TARGET_NRF51822) || defined(TARGET_STM32F411RE) || defined(TARGET_STM32F405RG) || defined(TARGET_K22F) || defined(TARGET_STM32F429ZI) || defined(TARGET_STM32F401VC)
5555
# define OS_TASKCNT 14
@@ -65,7 +65,7 @@
6565

6666
// <o>Scheduler (+ interrupts) stack size [bytes] <64-4096:8><#/4>
6767
#ifndef OS_SCHEDULERSTKSIZE
68-
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC4330) || defined(TARGET_LPC4337) || defined(TARGET_LPC1347) || defined(TARGET_K64F) || defined(TARGET_STM32F401RE)\
68+
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM) || defined(TARGET_LPC4330) || defined(TARGET_LPC4337) || defined(TARGET_LPC1347) || defined(TARGET_K64F) || defined(TARGET_STM32F401RE)\
6969
|| defined(TARGET_KL46Z) || defined(TARGET_KL43Z) || defined(TARGET_STM32F407) || defined(TARGET_F407VG) || defined(TARGET_STM32F303VC) || defined(TARGET_LPC1549) || defined(TARGET_LPC11U68) \
7070
|| defined(TARGET_NRF51822) || defined(TARGET_STM32F411RE) || defined(TARGET_STM32F405RG) || defined(TARGET_K22F) || defined(TARGET_STM32F429ZI) || defined(TARGET_STM32F401VC)
7171
# define OS_SCHEDULERSTKSIZE 256
@@ -135,7 +135,7 @@
135135
# elif defined(TARGET_STM32F100RB)
136136
# define OS_CLOCK 24000000
137137

138-
# elif defined(TARGET_LPC4088) || defined(TARGET_K64F) || defined(TARGET_K22F)
138+
# elif defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM) || defined(TARGET_K64F) || defined(TARGET_K22F)
139139
# define OS_CLOCK 120000000
140140

141141
# elif defined(TARGET_LPC4330)

‎libraries/tests/mbed/can/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CAN can1(D2, D3);
1111
CAN can1(p9, p10);
1212
#endif
1313

14-
#if defined(TARGET_LPC4088)
14+
#if defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
1515
CAN can2(p34, p33);
1616
#elif defined (TARGET_LPC1768)
1717
CAN can2(p30, p29);

‎workspace_tools/export/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,18 @@ Exporter IDE/Platform Support
470470
<td>&#10003;</td>
471471
<td>&#10003;</td>
472472
</tr>
473+
<tr>
474+
<td>LPC4088_DM</td>
475+
<td>-</td>
476+
<td>-</td>
477+
<td>-</td>
478+
<td>&#10003;</td>
479+
<td>&#10003;</td>
480+
<td>&#10003;</td>
481+
<td>-</td>
482+
<td>&#10003;</td>
483+
<td>&#10003;</td>
484+
</tr>
473485
<tr>
474486
<td>LPC4330_M0</td>
475487
<td>-</td>

‎workspace_tools/export/codered.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class CodeRed(Exporter):
2525
TARGETS = [
2626
'LPC1768',
2727
'LPC4088',
28+
'LPC4088_DM',
2829
'LPC4330_M4',
2930
'LPC1114',
3031
'LPC11U35_401',

0 commit comments

Comments
 (0)