From 6882a7af3bf3a3ea4ba8b2cfb491f25ab520dbfb Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Apr 2021 14:53:46 +0700 Subject: [PATCH 1/4] lpc1549 work well now --- hw/bsp/lpcxpresso1549/board.mk | 1 + hw/bsp/lpcxpresso1549/lpcxpresso1549.c | 63 ++++++++++++++++---------- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/hw/bsp/lpcxpresso1549/board.mk b/hw/bsp/lpcxpresso1549/board.mk index f4d109ec..2e69e8aa 100644 --- a/hw/bsp/lpcxpresso1549/board.mk +++ b/hw/bsp/lpcxpresso1549/board.mk @@ -29,6 +29,7 @@ SRC_C += \ $(MCU_DIR)/src/iocon_15xx.c \ $(MCU_DIR)/src/swm_15xx.c \ $(MCU_DIR)/src/sysctl_15xx.c \ + $(MCU_DIR)/src/uart_15xx.c \ $(MCU_DIR)/src/sysinit_15xx.c INC += \ diff --git a/hw/bsp/lpcxpresso1549/lpcxpresso1549.c b/hw/bsp/lpcxpresso1549/lpcxpresso1549.c index a10cd38e..a0d7c1ea 100644 --- a/hw/bsp/lpcxpresso1549/lpcxpresso1549.c +++ b/hw/bsp/lpcxpresso1549/lpcxpresso1549.c @@ -45,20 +45,26 @@ void USB_IRQHandler(void) #define BUTTON_PORT 0 #define BUTTON_PIN 17 +#define UART_PORT LPC_USART0 + /* System oscillator rate and RTC oscillator rate */ const uint32_t OscRateIn = 12000000; const uint32_t RTCOscRateIn = 32768; -/* Pin muxing table, only items that need changing from their default pin - state are in this table. */ +// Pinmux static const PINMUX_GRP_T pinmuxing[] = { - {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, /* PIO1_11-ISP_1 (VBUS) */ + {0, 25, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_25-BREAK_CTRL-RED (low enable) + {0, 13, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_13-ISP_RX + {0, 18, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_18-ISP_TX + {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, // PIO1_11-ISP_1 (VBUS) }; // Invoked by startup code void SystemInit(void) { + Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SRAM1); + Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SRAM2); Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_IOCON); Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SWM); Chip_SYSCTL_PeriphReset(RESET_IOCON); @@ -66,17 +72,25 @@ void SystemInit(void) // Pin Mux Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T)); + // SWIM + Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I , 1, 11); + Chip_SWM_MovablePortPinAssign(SWM_UART0_RXD_I, 0, 13); + Chip_SWM_MovablePortPinAssign(SWM_UART0_TXD_O, 0, 18); + Chip_SetupXtalClocking(); + + // USB: Setup PLL clock, and power + Chip_USB_Init(); } void board_init(void) { SystemCoreClockUpdate(); -#if CFG_TUSB_OS == OPT_OS_NONE // 1ms tick timer SysTick_Config(SystemCoreClock / 1000); -#elif CFG_TUSB_OS == OPT_OS_FREERTOS + +#if CFG_TUSB_OS == OPT_OS_FREERTOS // If freeRTOS is used, IRQ priority is limit by max syscall ( smaller is higher ) NVIC_SetPriority(USB0_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ); #endif @@ -89,28 +103,19 @@ void board_init(void) // Button Chip_GPIO_SetPinDIRInput(LPC_GPIO, BUTTON_PORT, BUTTON_PIN); - // USB: Setup PLL clock, and power - Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I, 1, 11); - Chip_USB_Init(); + // UART + Chip_Clock_SetUARTBaseClockRate(Chip_Clock_GetMainClockRate(), false); + Chip_UART_Init(UART_PORT); + Chip_UART_ConfigData(UART_PORT, UART_CFG_DATALEN_8 | UART_CFG_PARITY_NONE | UART_CFG_STOPLEN_1); + Chip_UART_SetBaud(UART_PORT, CFG_BOARD_UART_BAUDRATE); + Chip_UART_Enable(UART_PORT); + Chip_UART_TXEnable(UART_PORT); } //--------------------------------------------------------------------+ // Board porting API //--------------------------------------------------------------------+ -#if CFG_TUSB_OS == OPT_OS_NONE -volatile uint32_t system_ticks = 0; -void SysTick_Handler (void) -{ - system_ticks++; -} - -uint32_t board_millis(void) -{ - return system_ticks; -} -#endif - void board_led_write(bool state) { Chip_GPIO_SetPinState(LPC_GPIO, LED_PORT, LED_PIN, state); @@ -130,6 +135,18 @@ int board_uart_read(uint8_t* buf, int len) int board_uart_write(void const * buf, int len) { - (void) buf; (void) len; - return 0; + return Chip_UART_SendBlocking(UART_PORT, buf, len); } + +#if CFG_TUSB_OS == OPT_OS_NONE +volatile uint32_t system_ticks = 0; +void SysTick_Handler (void) +{ + system_ticks++; +} + +uint32_t board_millis(void) +{ + return system_ticks; +} +#endif From cd535537f603a00ae8d69ec9a720843925ce6c9f Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Apr 2021 15:02:11 +0700 Subject: [PATCH 2/4] update doc --- README.md | 2 +- docs/boards.md | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b77ddb66..aa03cb88 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ The stack supports the following MCUs: - **NXP:** - iMX RT Series: RT1011, RT1015, RT1021, RT1052, RT1062, RT1064 - Kinetis: KL25 - - LPC Series: 11Uxx, 13xx, 175x_6x, 177x_8x, 18xx, 40xx, 43xx, 51Uxx, 54xxx, 55xx + - LPC Series: 11u, 13, 15, 17, 18, 40, 43, 51u, 54, 55 - **Raspberry Pi:** RP2040 - **Renesas:** RX63N - **Silabs:** EFM32GG12 diff --git a/docs/boards.md b/docs/boards.md index 2a27ad30..ebba1f84 100644 --- a/docs/boards.md +++ b/docs/boards.md @@ -89,21 +89,33 @@ This code base already had supported for a handful of following boards (sorted a - [FRDM-KL25Z](https://www.nxp.com/design/development-boards/freedom-development-boards/mcu-boards/freedom-development-platform-for-kinetis-kl14-kl15-kl24-kl25-mcus:FRDM-KL25Z) -### NXP LPC +### NXP LPC 11-13-15 -- [ARM mbed LPC1768](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/arm-mbed-lpc1768-board:OM11043) -- [Embedded Artists LPC4088 Quick Start board](https://www.embeddedartists.com/products/lpc4088-quickstart-board) -- [Embedded Artists LPC4357 Developer Kit](http://www.embeddedartists.com/products/kits/lpc4357_kit.php) -- [Keil MCB1800 Evaluation Board](http://www.keil.com/mcb1800) - [LPCXpresso 11u37](https://www.nxp.com/design/microcontrollers-developer-resources/lpcxpresso-boards/lpcxpresso-board-for-lpc11u37h:OM13074) - [LPCXpresso 11u68](https://www.nxp.com/support/developer-resources/evaluation-and-development-boards/lpcxpresso-boards/lpcxpresso-board-for-lpc11u68:OM13058) - [LPCXpresso 1347](https://www.nxp.com/support/developer-resources/evaluation-and-development-boards/lpcxpresso-boards/lpcxpresso-board-for-lpc1347:OM13045) +- [LPCXpresso 1549](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1500-cortex-m3/lpcxpresso-board-for-lpc1549:OM13056) + +### NXP LPC 17-40 + +- [ARM mbed LPC1768](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/arm-mbed-lpc1768-board:OM11043) +- [Embedded Artists LPC4088 Quick Start board](https://www.embeddedartists.com/products/lpc4088-quickstart-board) - [LPCXpresso 1769](https://www.nxp.com/support/developer-resources/evaluation-and-development-boards/lpcxpresso-boards/lpcxpresso-board-for-lpc1769:OM13000) + +### NXP LPC 18-43 + +- [Embedded Artists LPC4357 Developer Kit](http://www.embeddedartists.com/products/kits/lpc4357_kit.php) +- [Keil MCB1800 Evaluation Board](http://www.keil.com/mcb1800) - [LPCXpresso18S37 Development Board](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc4000-cortex-m4/lpcxpresso18s37-development-board:OM13076) -- [LPCXpresso 51U68](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpcxpresso51u68-for-the-lpc51u68-mcus:OM40005) -- [LPCXpresso 54114](https://www.nxp.com/design/microcontrollers-developer-resources/lpcxpresso-boards/lpcxpresso54114-board:OM13089) - [NGX LPC4330-Xplorer](https://www.nxp.com/design/designs/lpc4330-xplorer-board:OM13027) +### NXP LPC 51 +- [LPCXpresso 51U68](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpcxpresso51u68-for-the-lpc51u68-mcus:OM40005) + +### NXP LPC 54 + +- [LPCXpresso 54114](https://www.nxp.com/design/microcontrollers-developer-resources/lpcxpresso-boards/lpcxpresso54114-board:OM13089) + ## NXP LPC55 - [Double M33 Express](https://www.crowdsupply.com/steiert-solutions/double-m33-express) From bbc6d4f9e857239a67b6418fe52f49f852ac58e4 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Apr 2021 15:10:31 +0700 Subject: [PATCH 3/4] create new lpc15 family --- hw/bsp/lpc15/boards/lpcxpresso1549/board.mk | 6 ++++++ hw/bsp/{ => lpc15/boards}/lpcxpresso1549/lpc1549.ld | 0 .../lpcxpresso1549.c => lpc15/family.c} | 2 +- hw/bsp/{lpcxpresso1549/board.mk => lpc15/family.mk} | 12 +++--------- 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 hw/bsp/lpc15/boards/lpcxpresso1549/board.mk rename hw/bsp/{ => lpc15/boards}/lpcxpresso1549/lpc1549.ld (100%) rename hw/bsp/{lpcxpresso1549/lpcxpresso1549.c => lpc15/family.c} (99%) rename hw/bsp/{lpcxpresso1549/board.mk => lpc15/family.mk} (82%) diff --git a/hw/bsp/lpc15/boards/lpcxpresso1549/board.mk b/hw/bsp/lpc15/boards/lpcxpresso1549/board.mk new file mode 100644 index 00000000..a3e04cfa --- /dev/null +++ b/hw/bsp/lpc15/boards/lpcxpresso1549/board.mk @@ -0,0 +1,6 @@ +LD_FILE = $(BOARD_PATH)/lpc1549.ld + +JLINK_DEVICE = LPC1549 + +# flash using pyocd +flash: flash-jlink diff --git a/hw/bsp/lpcxpresso1549/lpc1549.ld b/hw/bsp/lpc15/boards/lpcxpresso1549/lpc1549.ld similarity index 100% rename from hw/bsp/lpcxpresso1549/lpc1549.ld rename to hw/bsp/lpc15/boards/lpcxpresso1549/lpc1549.ld diff --git a/hw/bsp/lpcxpresso1549/lpcxpresso1549.c b/hw/bsp/lpc15/family.c similarity index 99% rename from hw/bsp/lpcxpresso1549/lpcxpresso1549.c rename to hw/bsp/lpc15/family.c index a0d7c1ea..cf873aa4 100644 --- a/hw/bsp/lpcxpresso1549/lpcxpresso1549.c +++ b/hw/bsp/lpc15/family.c @@ -25,7 +25,7 @@ */ #include "chip.h" -#include "../board.h" +#include "bsp/board.h" //--------------------------------------------------------------------+ // Forward USB interrupt events to TinyUSB IRQ Handler diff --git a/hw/bsp/lpcxpresso1549/board.mk b/hw/bsp/lpc15/family.mk similarity index 82% rename from hw/bsp/lpcxpresso1549/board.mk rename to hw/bsp/lpc15/family.mk index 2e69e8aa..90e8ca50 100644 --- a/hw/bsp/lpcxpresso1549/board.mk +++ b/hw/bsp/lpc15/family.mk @@ -1,5 +1,7 @@ DEPS_SUBMODULES += hw/mcu/nxp +include $(TOP)/$(BOARD_PATH)/board.mk + CFLAGS += \ -flto \ -mthumb \ @@ -17,9 +19,6 @@ CFLAGS += -Wno-error=strict-prototypes -Wno-error=unused-parameter -Wno-error=un MCU_DIR = hw/mcu/nxp/lpcopen/lpc15xx/lpc_chip_15xx -# All source paths should be relative to the top level. -LD_FILE = hw/bsp/$(BOARD)/lpc1549.ld - SRC_C += \ src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \ $(MCU_DIR)/../gcc/cr_startup_lpc15xx.c \ @@ -33,13 +32,8 @@ SRC_C += \ $(MCU_DIR)/src/sysinit_15xx.c INC += \ + $(TOP)/$(BOARD_PATH) \ $(TOP)/$(MCU_DIR)/inc # For freeRTOS port source FREERTOS_PORT = ARM_CM3 - -# For flash-jlink target -JLINK_DEVICE = LPC1549 - -# flash using jlink -flash: flash-jlink From c1c4b2f6bf7a159b7f04ae2d5089b006d1767038 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Apr 2021 15:16:36 +0700 Subject: [PATCH 4/4] complete lpc15 family --- .github/workflows/build.yml | 1 + hw/bsp/lpc15/boards/lpcxpresso1549/board.h | 72 ++++++++++++++++++++++ hw/bsp/lpc15/family.c | 36 +++-------- 3 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 hw/bsp/lpc15/boards/lpcxpresso1549/board.h diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c7b074a..c88722b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,7 @@ jobs: family: # Alphabetical order - 'imxrt' + - 'lpc15' - 'lpc18' - 'lpc55' - 'nrf' diff --git a/hw/bsp/lpc15/boards/lpcxpresso1549/board.h b/hw/bsp/lpc15/boards/lpcxpresso1549/board.h new file mode 100644 index 00000000..5ed5b75b --- /dev/null +++ b/hw/bsp/lpc15/boards/lpcxpresso1549/board.h @@ -0,0 +1,72 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2021, Ha Thach (tinyusb.org) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * This file is part of the TinyUSB stack. + */ + +#ifndef BOARD_H_ +#define BOARD_H_ + +#ifdef __cplusplus + extern "C" { +#endif + +// XTAL +#define XTAL_OscRateIn 12000000 +#define XTAL_RTCOscRateIn 32768 + +// LED +#define LED_PORT 0 +#define LED_PIN 25 + +// Wake Switch +#define BUTTON_PORT 0 +#define BUTTON_PIN 17 + +#define UART_PORT LPC_USART0 + +static inline void board_lpc15_pinmux_swm_init(void) +{ + // Pinmux + const PINMUX_GRP_T pinmuxing[] = + { + {0, 25, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_25-BREAK_CTRL-RED (low enable) + {0, 13, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_13-ISP_RX + {0, 18, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_18-ISP_TX + {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, // PIO1_11-ISP_1 (VBUS) + }; + + // Pin Mux + Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T)); + + // SWIM + Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I , 1, 11); + Chip_SWM_MovablePortPinAssign(SWM_UART0_RXD_I, 0, 13); + Chip_SWM_MovablePortPinAssign(SWM_UART0_TXD_O, 0, 18); +} + +#ifdef __cplusplus + } +#endif + +#endif diff --git a/hw/bsp/lpc15/family.c b/hw/bsp/lpc15/family.c index cf873aa4..7f5984a3 100644 --- a/hw/bsp/lpc15/family.c +++ b/hw/bsp/lpc15/family.c @@ -26,6 +26,7 @@ #include "chip.h" #include "bsp/board.h" +#include "board.h" //--------------------------------------------------------------------+ // Forward USB interrupt events to TinyUSB IRQ Handler @@ -38,27 +39,10 @@ void USB_IRQHandler(void) //--------------------------------------------------------------------+ // MACRO TYPEDEF CONSTANT ENUM //--------------------------------------------------------------------+ -#define LED_PORT 0 -#define LED_PIN 25 - -// Wake Switch -#define BUTTON_PORT 0 -#define BUTTON_PIN 17 - -#define UART_PORT LPC_USART0 /* System oscillator rate and RTC oscillator rate */ -const uint32_t OscRateIn = 12000000; -const uint32_t RTCOscRateIn = 32768; - -// Pinmux -static const PINMUX_GRP_T pinmuxing[] = -{ - {0, 25, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_25-BREAK_CTRL-RED (low enable) - {0, 13, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_13-ISP_RX - {0, 18, (IOCON_MODE_INACT | IOCON_DIGMODE_EN)}, // PIO0_18-ISP_TX - {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, // PIO1_11-ISP_1 (VBUS) -}; +const uint32_t OscRateIn = XTAL_OscRateIn; +const uint32_t RTCOscRateIn = XTAL_RTCOscRateIn; // Invoked by startup code void SystemInit(void) @@ -69,18 +53,9 @@ void SystemInit(void) Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SWM); Chip_SYSCTL_PeriphReset(RESET_IOCON); - // Pin Mux - Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T)); - - // SWIM - Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I , 1, 11); - Chip_SWM_MovablePortPinAssign(SWM_UART0_RXD_I, 0, 13); - Chip_SWM_MovablePortPinAssign(SWM_UART0_TXD_O, 0, 18); + board_lpc15_pinmux_swm_init(); Chip_SetupXtalClocking(); - - // USB: Setup PLL clock, and power - Chip_USB_Init(); } void board_init(void) @@ -110,6 +85,9 @@ void board_init(void) Chip_UART_SetBaud(UART_PORT, CFG_BOARD_UART_BAUDRATE); Chip_UART_Enable(UART_PORT); Chip_UART_TXEnable(UART_PORT); + + // USB: Setup PLL clock, and power + Chip_USB_Init(); } //--------------------------------------------------------------------+