Skip to content

Commit 270136e

Browse files
committed
adding cpu core .mk for makefile
fix cortex m33 for nrf5340 dk
1 parent e8dd200 commit 270136e

File tree

6 files changed

+41
-5
lines changed

6 files changed

+41
-5
lines changed

examples/make.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Common make definition for all examples
33
# ---------------------------------------
44

5+
TOOLCHAIN ?= gcc
6+
57
#-------------- TOP and CURRENT_PATH ------------
68

79
# Set TOP to be the path to get from the current directory (where make was
@@ -75,6 +77,7 @@ else
7577
endif
7678

7779
#-------------- Cross Compiler ------------
80+
7881
# Can be set by board, default to ARM GCC
7982
CROSS_COMPILE ?= arm-none-eabi-
8083

hw/bsp/nrf/boards/pca10095/board.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CPU_CORE = cortex-m33
12
MCU_VARIANT = nrf5340_application
23
CFLAGS += -DNRF5340_XXAA -DNRF5340_XXAA_APPLICATION
34

hw/bsp/nrf/family.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/nordic/nrfx
33

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

6+
CPU_CORE ?= cortex-m4
7+
8+
include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
9+
610
CFLAGS += \
711
-flto \
8-
-mthumb \
9-
-mabi=aapcs \
10-
-mcpu=cortex-m4 \
11-
-mfloat-abi=hard \
12-
-mfpu=fpv4-sp-d16 \
1312
-DCFG_TUSB_MCU=OPT_MCU_NRF5X \
1413
-DCONFIG_GPIO_AS_PINRESET
1514

tools/make/cpu/cortex-m33.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ifeq ($(TOOLCHAIN),gcc)
2+
CFLAGS += \
3+
-mthumb \
4+
-mcpu=cortex-m33 \
5+
-mfloat-abi=hard \
6+
-mfpu=fpv5-d16 \
7+
8+
#set(FREERTOS_PORT GCC_ARM_CM33_NONSECURE CACHE INTERNAL "")
9+
else ifeq ($(TOOLCHAIN),iar)
10+
# TODO support IAR
11+
endif

tools/make/cpu/cortex-m4.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ifeq ($(TOOLCHAIN),gcc)
2+
CFLAGS += \
3+
-mthumb \
4+
-mcpu=cortex-m4 \
5+
-mfloat-abi=hard \
6+
-mfpu=fpv4-sp-d16 \
7+
8+
#set(FREERTOS_PORT GCC_ARM_CM4F CACHE INTERNAL "")
9+
else ifeq ($(TOOLCHAIN),iar)
10+
# TODO support IAR
11+
endif

tools/make/cpu/cortex-m7.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ifeq ($(TOOLCHAIN),gcc)
2+
CFLAGS += \
3+
-mthumb \
4+
-mcpu=cortex-m7 \
5+
-mfloat-abi=hard \
6+
-mfpu=fpv5-d16 \
7+
8+
#set(FREERTOS_PORT GCC_ARM_CM7 CACHE INTERNAL "")
9+
else ifeq ($(TOOLCHAIN),iar)
10+
# TODO support IAR
11+
endif

0 commit comments

Comments
 (0)