riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/cortexm_common: Move common modules to Makefile.dep

Browse Source 
This moves the following modules to a architecture-specific Makefile.dep
file:
- cortexm_common
- cortexm_common_periph
- newlib
- newlib_nano
- periph
This commit is contained in:
Leandro Lanzieri 2020-03-27 02:30:11 +01:00
parent d9b9426a86
commit 64552a3b9a
No known key found for this signature in database
GPG Key ID: 39607DE6080007A3
14 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/cc2538/Makefile.dep
View File

@ -8,3 +8,5 @@ ifneq (,$(filter periph_rtc,$(USEMODULE)))
endif endif
USEMODULE += pm_layered USEMODULE += pm_layered
include $(RIOTCPU)/cortexm_common/Makefile.dep

2
cpu/cc26xx_cc13xx/Makefile.dep
View File

@ -1 +1,3 @@
USEMODULE += periph_common cc26xx_cc13xx_periph USEMODULE += periph_common cc26xx_cc13xx_periph
include $(RIOTCPU)/cortexm_common/Makefile.dep

14
cpu/cortexm_common/Makefile.dep Normal file
View File

@ -0,0 +1,14 @@
# Tell the build system that the CPU depends on the Cortex-M common files:
USEMODULE += cortexm_common
# include common periph code
USEMODULE += cortexm_common_periph
# all cortex MCU's use newlib as libc
USEMODULE += newlib
# use the nano-specs of Newlib when available
USEMODULE += newlib_nano
# Export the peripheral drivers to be linked into the final binary:
USEMODULE += periph

2
cpu/efm32/Makefile.dep
View File

@ -19,3 +19,5 @@ endif
# include CPU family module # include CPU family module
USEMODULE += cpu_$(CPU_FAM) USEMODULE += cpu_$(CPU_FAM)
include $(RIOTCPU)/cortexm_common/Makefile.dep

1
cpu/ezr32wg/Makefile.dep Normal file
View File

@ -0,0 +1 @@
include $(RIOTCPU)/cortexm_common/Makefile.dep

2
cpu/kinetis/Makefile.dep
View File

@ -4,3 +4,5 @@ endif
ifneq (,$(filter periph_i2c,$(USEMODULE))) ifneq (,$(filter periph_i2c,$(USEMODULE)))
USEMODULE += core_thread_flags USEMODULE += core_thread_flags
endif endif
include $(RIOTCPU)/cortexm_common/Makefile.dep

1
cpu/lm4f120/Makefile.dep Normal file
View File

@ -0,0 +1 @@
include $(RIOTCPU)/cortexm_common/Makefile.dep

2
cpu/lpc1768/Makefile.dep
View File

@ -1 +1,3 @@
USEMODULE += pm_layered USEMODULE += pm_layered
include $(RIOTCPU)/cortexm_common/Makefile.dep

1
cpu/nrf51/Makefile.dep
View File

@ -1 +1,2 @@
include $(RIOTCPU)/nrf5x_common/Makefile.dep include $(RIOTCPU)/nrf5x_common/Makefile.dep
include $(RIOTCPU)/cortexm_common/Makefile.dep

1
cpu/nrf52/Makefile.dep
View File

@ -6,3 +6,4 @@ ifneq (,$(filter nrf802154,$(USEMODULE)))
endif endif
include $(RIOTCPU)/nrf5x_common/Makefile.dep include $(RIOTCPU)/nrf5x_common/Makefile.dep
include $(RIOTCPU)/cortexm_common/Makefile.dep

2
cpu/sam0_common/Makefile.dep
View File

@ -7,3 +7,5 @@ USEMODULE += pm_layered
# include sam0 common periph drivers # include sam0 common periph drivers
USEMODULE += sam0_common_periph USEMODULE += sam0_common_periph
include $(RIOTCPU)/cortexm_common/Makefile.dep

1
cpu/sam3/Makefile.dep Normal file
View File

@ -0,0 +1 @@
include $(RIOTCPU)/cortexm_common/Makefile.dep

2
cpu/stm32_common/Makefile.dep
View File

@ -7,3 +7,5 @@ USEMODULE += stm32_common stm32_common_periph
ifneq (,$(filter periph_usbdev,$(FEATURES_USED))) ifneq (,$(filter periph_usbdev,$(FEATURES_USED)))
USEMODULE += xtimer USEMODULE += xtimer
endif endif
include $(RIOTCPU)/cortexm_common/Makefile.dep

14
makefiles/arch/cortexm.inc.mk
View File

@ -33,17 +33,6 @@ LINKFLAGS += -T$(LINKER_SCRIPT) -Wl,--fatal-warnings
LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) -static -lgcc -nostartfiles LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) -static -lgcc -nostartfiles
LINKFLAGS += -Wl,--gc-sections LINKFLAGS += -Wl,--gc-sections
# Tell the build system that the CPU depends on the Cortex-M common files:
USEMODULE += cortexm_common
# Export the peripheral drivers to be linked into the final binary:
USEMODULE += periph
# include common periph code
USEMODULE += cortexm_common_periph
# all cortex MCU's use newlib as libc
USEMODULE += newlib
# extract version inside the first parentheses # extract version inside the first parentheses
ARM_GCC_VERSION = $(shell $(TARGET_ARCH)-gcc --version | sed -n '1 s/[^(]*(\([^\)]*\)).*/\1/p') ARM_GCC_VERSION = $(shell $(TARGET_ARCH)-gcc --version | sed -n '1 s/[^(]*(\([^\)]*\)).*/\1/p')
@ -126,9 +115,6 @@ endif
# CPU depends on the cortex-m common module, so include it: # CPU depends on the cortex-m common module, so include it:
include $(RIOTCPU)/cortexm_common/Makefile.include include $(RIOTCPU)/cortexm_common/Makefile.include
# use the nano-specs of Newlib when available
USEMODULE += newlib_nano
# Avoid overriding the default rule: # Avoid overriding the default rule:
all: all: