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