Skip to content

Commit 0069cc6

Browse files
committed
Fixed lpc51,54 and lpc55 to build with mcuxpresso sdk 2.16.10
libpower_hardabi.a no longer is included in mcuxpressosdk, (fsl_power.c is replacement). remove of libpower_hardabi.a from linker config
1 parent 770ac3d commit 0069cc6

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

README.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ Supported CPUs
167167
| | +-------------------+--------+------+-----------+------------------------+-------------------+
168168
| | | 54, 55 || || lpc_ip3511 | |
169169
| +---------+-------------------+--------+------+-----------+------------------------+-------------------+
170-
| | MCX | N9, A15 || || ci_fs, ci_hs | |
170+
| | MCX | N9 || || ci_fs, ci_hs | |
171+
| | +-------------------+--------+------+-----------+------------------------+-------------------+
172+
| | | A15 || | | ci_fs | |
171173
+--------------+---------+-------------------+--------+------+-----------+------------------------+-------------------+
172174
| Raspberry Pi | RP2040, RP2350 |||| rp2040, pio_usb | |
173175
+--------------+-----+-----------------------+--------+------+-----------+------------------------+-------------------+

hw/bsp/lpc51/family.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function(add_board_target BOARD_TARGET)
3636
# driver
3737
${SDK_DIR}/drivers/lpc_gpio/fsl_gpio.c
3838
${SDK_DIR}/drivers/flexcomm/fsl_flexcomm.c
39-
${SDK_DIR}/drivers/flexcomm/fsl_usart.c
39+
${SDK_DIR}/drivers/flexcomm/usart/fsl_usart.c
4040
# mcu
4141
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_VARIANT}.c
4242
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c

hw/bsp/lpc51/family.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ SRC_C += \
2828
$(MCU_DIR)/drivers/fsl_reset.c \
2929
$(SDK_DIR)/drivers/lpc_gpio/fsl_gpio.c \
3030
$(SDK_DIR)/drivers/flexcomm/fsl_flexcomm.c \
31-
$(SDK_DIR)/drivers/flexcomm/fsl_usart.c
31+
$(SDK_DIR)/drivers/flexcomm/usart/fsl_usart.c
3232

3333
INC += \
34-
$(TOP)/$(BOARD_PATH) \
35-
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
34+
$(TOP)/$(BOARD_PATH) \
35+
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
3636
$(TOP)/$(MCU_DIR) \
3737
$(TOP)/$(MCU_DIR)/drivers \
3838
$(TOP)/$(SDK_DIR)/drivers/common \
3939
$(TOP)/$(SDK_DIR)/drivers/flexcomm \
40+
$(TOP)/$(SDK_DIR)/drivers/flexcomm/usart \
4041
$(TOP)/$(SDK_DIR)/drivers/lpc_iocon \
4142
$(TOP)/$(SDK_DIR)/drivers/lpc_gpio
42-
43+
4344
SRC_S += $(MCU_DIR)/gcc/startup_$(MCU).S
4445

4546
LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower.a

hw/bsp/lpc54/family.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function(add_board_target BOARD_TARGET)
4444
${SDK_DIR}/drivers/lpc_gpio/fsl_gpio.c
4545
${SDK_DIR}/drivers/common/fsl_common_arm.c
4646
${SDK_DIR}/drivers/flexcomm/fsl_flexcomm.c
47-
${SDK_DIR}/drivers/flexcomm/fsl_usart.c
47+
${SDK_DIR}/drivers/flexcomm/usart/fsl_usart.c
4848
# mcu
4949
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_CORE}.c
5050
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c
@@ -56,6 +56,7 @@ function(add_board_target BOARD_TARGET)
5656
# driver
5757
${SDK_DIR}/drivers/common
5858
${SDK_DIR}/drivers/flexcomm
59+
${SDK_DIR}/drivers/flexcomm/usart
5960
${SDK_DIR}/drivers/lpc_iocon
6061
${SDK_DIR}/drivers/lpc_gpio
6162
${SDK_DIR}/drivers/lpuart

hw/bsp/lpc54/family.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SRC_C += \
3636
$(MCU_DIR)/drivers/fsl_reset.c \
3737
$(SDK_DIR)/drivers/lpc_gpio/fsl_gpio.c \
3838
$(SDK_DIR)/drivers/flexcomm/fsl_flexcomm.c \
39-
$(SDK_DIR)/drivers/flexcomm/fsl_usart.c \
39+
$(SDK_DIR)/drivers/flexcomm/usart/fsl_usart.c \
4040
$(SDK_DIR)/drivers/common/fsl_common_arm.c
4141

4242
INC += \
@@ -46,6 +46,7 @@ INC += \
4646
$(TOP)/$(MCU_DIR)/drivers \
4747
$(TOP)/$(SDK_DIR)/drivers/common \
4848
$(TOP)/$(SDK_DIR)/drivers/flexcomm \
49+
$(TOP)/$(SDK_DIR)/drivers/flexcomm/usart \
4950
$(TOP)/$(SDK_DIR)/drivers/lpc_iocon \
5051
$(TOP)/$(SDK_DIR)/drivers/lpc_gpio
5152

hw/bsp/lpc55/family.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function(add_board_target BOARD_TARGET)
4444
${SDK_DIR}/drivers/lpc_gpio/fsl_gpio.c
4545
${SDK_DIR}/drivers/common/fsl_common_arm.c
4646
${SDK_DIR}/drivers/flexcomm/fsl_flexcomm.c
47-
${SDK_DIR}/drivers/flexcomm/fsl_usart.c
47+
${SDK_DIR}/drivers/flexcomm/usart/fsl_usart.c
4848
# mcu
4949
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_CORE}.c
5050
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c
@@ -56,9 +56,9 @@ function(add_board_target BOARD_TARGET)
5656
# driver
5757
${SDK_DIR}/drivers/common
5858
${SDK_DIR}/drivers/flexcomm
59+
${SDK_DIR}/drivers/flexcomm/usart
5960
${SDK_DIR}/drivers/lpc_iocon
6061
${SDK_DIR}/drivers/lpc_gpio
61-
${SDK_DIR}/drivers/lpuart
6262
${SDK_DIR}/drivers/sctimer
6363
# mcu
6464
${SDK_DIR}/devices/${MCU_VARIANT}

hw/bsp/lpc55/family.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SRC_C += \
4545
$(SDK_DIR)/drivers/lpc_gpio/fsl_gpio.c \
4646
$(SDK_DIR)/drivers/common/fsl_common_arm.c \
4747
$(SDK_DIR)/drivers/flexcomm/fsl_flexcomm.c \
48-
$(SDK_DIR)/drivers/flexcomm/fsl_usart.c \
48+
$(SDK_DIR)/drivers/flexcomm/usart/fsl_usart.c \
4949
lib/sct_neopixel/sct_neopixel.c
5050

5151
INC += \
@@ -55,11 +55,12 @@ INC += \
5555
$(TOP)/$(MCU_DIR) \
5656
$(TOP)/$(MCU_DIR)/drivers \
5757
$(TOP)/$(SDK_DIR)/drivers/common \
58-
$(TOP)/$(SDK_DIR)/drivers/flexcomm \
58+
$(TOP)/$(SDK_DIR)/drivers/flexcomm/usart \
59+
$(TOP)/$(SDK_DIR)/drivers/flexcomm/ \
5960
$(TOP)/$(SDK_DIR)/drivers/lpc_iocon \
6061
$(TOP)/$(SDK_DIR)/drivers/lpc_gpio \
6162
$(TOP)/$(SDK_DIR)/drivers/sctimer
6263

6364
SRC_S += $(MCU_DIR)/gcc/startup_$(MCU_CORE).S
6465

65-
LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower_hardabi.a
66+

0 commit comments

Comments
 (0)