andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix lpc55 build

Browse Source
This commit is contained in:
hathach
2021-04-28 19:53:31 +07:00
parent 810057bdb2
commit fcedb2eecb
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/bsp/lpc55/boards/double_m33_express/board.h
View File

@@ -54,7 +54,7 @@
#define UART_TX_PINMUX 0U, 30U, IOCON_PIO_DIG_FUNC1_EN #define UART_TX_PINMUX 0U, 30U, IOCON_PIO_DIG_FUNC1_EN
// XTAL // XTAL
//#define XTAL0_CLK_HZ 16000000U #define XTAL0_CLK_HZ (16 * 1000 * 1000U)
#ifdef __cplusplus #ifdef __cplusplus
} }

1
hw/bsp/lpc55/boards/double_m33_express/board.mk
View File

@@ -1,5 +1,6 @@
MCU_VARIANT = LPC55S69 MCU_VARIANT = LPC55S69
MCU_CORE = LPC55S69_cm33_core0 MCU_CORE = LPC55S69_cm33_core0
PORT ?= 1
CFLAGS += -DCPU_LPC55S69JBD100_cm33_core0 CFLAGS += -DCPU_LPC55S69JBD100_cm33_core0
LD_FILE = $(BOARD_PATH)/LPC55S69_cm33_core0_uf2.ld LD_FILE = $(BOARD_PATH)/LPC55S69_cm33_core0_uf2.ld

2
hw/bsp/lpc55/boards/lpcxpresso55s28/board.h
View File

@@ -47,7 +47,7 @@
#define UART_TX_PINMUX 0, 30, IOCON_PIO_DIG_FUNC1_EN #define UART_TX_PINMUX 0, 30, IOCON_PIO_DIG_FUNC1_EN
// XTAL // XTAL
#define XTAL0_CLK_HZ 16000000U #define XTAL0_CLK_HZ (16 * 1000 * 1000U)
#ifdef __cplusplus #ifdef __cplusplus
} }

2
hw/bsp/lpc55/boards/lpcxpresso55s69/board.h
View File

@@ -47,7 +47,7 @@
#define UART_TX_PINMUX 0, 30, IOCON_PIO_DIG_FUNC1_EN #define UART_TX_PINMUX 0, 30, IOCON_PIO_DIG_FUNC1_EN
// XTAL // XTAL
#define XTAL0_CLK_HZ 16000000U #define XTAL0_CLK_HZ (16 * 1000 * 1000U)
#ifdef __cplusplus #ifdef __cplusplus
} }

22
hw/bsp/lpc55/family.mk
View File

@@ -1,10 +1,11 @@
UF2_FAMILY_ID = 0x2abc77ec UF2_FAMILY_ID = 0x2abc77ec
DEPS_SUBMODULES += lib/sct_neopixel hw/mcu/nxp/mcux-sdk SDK_DIR = hw/mcu/nxp/mcux-sdk
DEPS_SUBMODULES += lib/sct_neopixel $(SDK_DIR)
include $(TOP)/$(BOARD_PATH)/board.mk include $(TOP)/$(BOARD_PATH)/board.mk
# TODO change Default to Highspeed PORT1 # Default to Highspeed PORT1
PORT ?= 0 PORT ?= 1
CFLAGS += \ CFLAGS += \
-flto \ -flto \
@@ -30,7 +31,7 @@ endif
# mcu driver cause following warnings # mcu driver cause following warnings
CFLAGS += -Wno-error=unused-parameter -Wno-error=float-equal CFLAGS += -Wno-error=unused-parameter -Wno-error=float-equal
MCU_DIR = hw/mcu/nxp/mcux-sdk/devices/$(MCU_VARIANT) MCU_DIR = $(SDK_DIR)/devices/$(MCU_VARIANT)
# All source paths should be relative to the top level. # All source paths should be relative to the top level.
LD_FILE ?= $(MCU_DIR)/gcc/$(MCU_CORE)_flash.ld LD_FILE ?= $(MCU_DIR)/gcc/$(MCU_CORE)_flash.ld
@@ -39,11 +40,11 @@ SRC_C += \
src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \ src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
$(MCU_DIR)/system_$(MCU_CORE).c \ $(MCU_DIR)/system_$(MCU_CORE).c \
$(MCU_DIR)/drivers/fsl_clock.c \ $(MCU_DIR)/drivers/fsl_clock.c \
$(MCU_DIR)/drivers/fsl_gpio.c \
$(MCU_DIR)/drivers/fsl_power.c \ $(MCU_DIR)/drivers/fsl_power.c \
$(MCU_DIR)/drivers/fsl_reset.c \ $(MCU_DIR)/drivers/fsl_reset.c \
$(MCU_DIR)/drivers/fsl_usart.c \ $(SDK_DIR)/drivers/lpc_gpio/fsl_gpio.c \
$(MCU_DIR)/drivers/fsl_flexcomm.c \ $(SDK_DIR)/drivers/flexcomm/fsl_flexcomm.c \
$(SDK_DIR)/drivers/flexcomm/fsl_usart.c \
lib/sct_neopixel/sct_neopixel.c lib/sct_neopixel/sct_neopixel.c
INC += \ INC += \
@@ -51,7 +52,12 @@ INC += \
$(TOP)/lib/sct_neopixel \ $(TOP)/lib/sct_neopixel \
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \ $(TOP)/$(MCU_DIR)/../../CMSIS/Include \
$(TOP)/$(MCU_DIR) \ $(TOP)/$(MCU_DIR) \
$(TOP)/$(MCU_DIR)/drivers $(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(SDK_DIR)/drivers/common \
$(TOP)/$(SDK_DIR)/drivers/flexcomm \
$(TOP)/$(SDK_DIR)/drivers/lpc_iocon \
$(TOP)/$(SDK_DIR)/drivers/lpc_gpio \
$(TOP)/$(SDK_DIR)/drivers/sctimer
SRC_S += $(MCU_DIR)/gcc/startup_$(MCU_CORE).S SRC_S += $(MCU_DIR)/gcc/startup_$(MCU_CORE).S