nrf5/boards: Updating makefiles to use system.c files based on sub-variant of mcu.

This commit is contained in:
Glenn Ruben Bakke 2017-01-08 15:15:36 +01:00
parent 721065b307
commit 4f04eed4c5
8 changed files with 18 additions and 11 deletions

View File

@ -63,7 +63,7 @@ INC += -I./hal/$(MCU_VARIANT)
INC += -I./drivers/display INC += -I./drivers/display
INC += -I../lib/mp-readline INC += -I../lib/mp-readline
NRF_DEFINES = -D$(MCU_VARIANT_UPPER) NRF_DEFINES += -D$(MCU_VARIANT_UPPER)
NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
CFLAGS_CORTEX_M = -mthumb -mabi=aapcs -fsingle-precision-constant -Wdouble-promotion CFLAGS_CORTEX_M = -mthumb -mabi=aapcs -fsingle-precision-constant -Wdouble-promotion
@ -159,7 +159,7 @@ DRIVERS_SRC_C += $(addprefix drivers/,\
#ifeq ($(SD), ) #ifeq ($(SD), )
SRC_C += \ SRC_C += \
device/$(MCU_VARIANT)/system_$(MCU_VARIANT).c \ device/$(MCU_VARIANT)/system_$(MCU_SUB_VARIANT).c \
SRC_S = \ SRC_S = \
device/$(MCU_VARIANT)/startup_$(MCU_VARIANT).s \ device/$(MCU_VARIANT)/startup_$(MCU_VARIANT).s \

View File

@ -1,5 +1,5 @@
MCU_SERIES = m0 MCU_SERIES = m0
MCU_VARIANT = nrf51 MCU_VARIANT = nrf51
LD_FILE = boards/nrf51822_aa.ld MCU_SUB_VARIANT = nrf51822
LD_FILE = boards/$(MCU_SUB_VARIANT)_aa.ld
FLASHER = pyocd FLASHER = pyocd

View File

@ -1,4 +1,5 @@
MCU_SERIES = m0 MCU_SERIES = m0
MCU_VARIANT = nrf51 MCU_VARIANT = nrf51
LD_FILE = boards/nrf51822_aa.ld MCU_SUB_VARIANT = nrf51822
LD_FILE = boards/$(MCU_SUB_VARIANT)_aa.ld

View File

@ -1,3 +1,4 @@
MCU_SERIES = m0 MCU_SERIES = m0
MCU_VARIANT = nrf51 MCU_VARIANT = nrf51
LD_FILE = boards/nrf51822_aa.ld MCU_SUB_VARIANT = nrf51822
LD_FILE = boards/$(MCU_SUB_VARIANT)_aa.ld

View File

@ -1,4 +1,4 @@
MCU_SERIES = m0 MCU_SERIES = m0
MCU_VARIANT = nrf51 MCU_VARIANT = nrf51
LD_FILE = boards/nrf51822_ac.ld MCU_SUB_VARIANT = nrf51822
LD_FILE = boards/$(MCU_SUB_VARIANT)_ac.ld

View File

@ -1,3 +1,4 @@
MCU_SERIES = m0 MCU_SERIES = m0
MCU_VARIANT = nrf51 MCU_VARIANT = nrf51
LD_FILE = boards/nrf51822_ac.ld MCU_SUB_VARIANT = nrf51822
LD_FILE = boards/$(MCU_SUB_VARIANT)_ac.ld

View File

@ -1,4 +1,6 @@
MCU_SERIES = m4 MCU_SERIES = m4
MCU_VARIANT = nrf52 MCU_VARIANT = nrf52
LD_FILE = boards/nrf52832_aa.ld MCU_SUB_VARIANT = nrf52832
LD_FILE = boards/$(MCU_SUB_VARIANT)_aa.ld
NRF_DEFINES += -DNRF52832_XXAA

View File

@ -1,4 +1,6 @@
MCU_SERIES = m4 MCU_SERIES = m4
MCU_VARIANT = nrf52 MCU_VARIANT = nrf52
LD_FILE = boards/nrf52840_aa.ld MCU_SUB_VARIANT = nrf52840
LD_FILE = boards/$(MCU_SUB_VARIANT)_aa.ld
NRF_DEFINES += -DNRF52840_XXAA