Skip to content

Commit 9f0bae4

Browse files
committed
fix freertos build with nrf
1 parent 49d8d27 commit 9f0bae4

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

hw/bsp/nrf/family.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/nordic/nrfx
33

44
include $(TOP)/$(BOARD_PATH)/board.mk
55

6+
# nRF52 is cortex-m4, nRF53 is cortex-m33
67
CPU_CORE ?= cortex-m4
7-
88
include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
99

1010
CFLAGS += \
@@ -36,8 +36,5 @@ SRC_S += hw/mcu/nordic/nrfx/mdk/gcc_startup_$(MCU_VARIANT).S
3636

3737
ASFLAGS += -D__HEAP_SIZE=0
3838

39-
# For freeRTOS port source
40-
FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM4F
41-
4239
# For flash-jlink target
4340
JLINK_DEVICE ?= $(MCU_VARIANT)_xxaa

tools/make/cpu/cortex-m33.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ifeq ($(TOOLCHAIN),gcc)
66
-mfpu=fpv5-d16 \
77

88
#set(FREERTOS_PORT GCC_ARM_CM33_NONSECURE CACHE INTERNAL "")
9+
FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM33_NTZ/non_secure
910
else ifeq ($(TOOLCHAIN),iar)
1011
# TODO support IAR
1112
endif

tools/make/cpu/cortex-m4.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ifeq ($(TOOLCHAIN),gcc)
66
-mfpu=fpv4-sp-d16 \
77

88
#set(FREERTOS_PORT GCC_ARM_CM4F CACHE INTERNAL "")
9+
FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM4F
910
else ifeq ($(TOOLCHAIN),iar)
1011
# TODO support IAR
1112
endif

tools/make/cpu/cortex-m7.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ifeq ($(TOOLCHAIN),gcc)
66
-mfpu=fpv5-d16 \
77

88
#set(FREERTOS_PORT GCC_ARM_CM7 CACHE INTERNAL "")
9+
FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM7/r0p1
910
else ifeq ($(TOOLCHAIN),iar)
1011
# TODO support IAR
1112
endif

0 commit comments

Comments
 (0)