treewide: clean up includes of makefiles/arch/...

Instead of having each CPU family including $(RIOTMAKE)/arch/<ARCH>.inc.mk, just include $(RIOTMAKE)/arch/$(CPU_ARCH).inc.mk at Makefile.include
RIOT-OS · Feb 22, 2021 · dcc2dec · dcc2dec
1 parent 1723eab
commit dcc2dec
Show file tree

Hide file tree

Showing 34 changed files with 11 additions and 35 deletions.
diff --git a/Makefile.include b/Makefile.include
@@ -394,6 +394,9 @@ include $(BOARDDIR)/Makefile.include
 INCLUDES += -I$(RIOTCPU)/$(CPU)/include
 include $(RIOTCPU)/$(CPU)/Makefile.include
 
+# include architecture specific settings, if any
+-include $(RIOTMAKE)/arch/$(CPU_ARCH).inc.mk
+
 # Include common serial logic to define TERMPROG, TERMFLAGS variables based on
 # the content of RIOT_TERMINAL
 include $(RIOTMAKE)/tools/serial.inc.mk

diff --git a/cpu/arm7_common/Makefile.include b/cpu/arm7_common/Makefile.include
@@ -1,3 +1 @@
 INCLUDES += -I$(RIOTBASE)/cpu/arm7_common/include/
-
-include $(RIOTMAKE)/arch/arm7.inc.mk
diff --git a/cpu/avr8_common/Makefile.include b/cpu/avr8_common/Makefile.include
@@ -2,5 +2,3 @@
 INCLUDES += -I$(RIOTCPU)/avr8_common/include \
             -isystem$(RIOTCPU)/avr8_common/avr_libc_extra/include \
             -isystem$(RIOTCPU)/avr8_common/avr_libc_extra/include/vendor
-
-include $(RIOTMAKE)/arch/atmega.inc.mk
diff --git a/cpu/cc2538/Makefile.include b/cpu/cc2538/Makefile.include
@@ -42,5 +42,3 @@ LINKER_SCRIPT ?= cc2538.ld
 ifneq (,$(filter riotboot,$(FEATURES_USED)))
   CFLAGS += -DUPDATE_CCA=0
 endif
-
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/cc26x0_cc13x0/Makefile.include b/cpu/cc26x0_cc13x0/Makefile.include
@@ -7,4 +7,3 @@ ROM_LEN ?= 128K
 RAM_LEN ?= 20K
 
 include ${RIOTCPU}/cc26xx_cc13xx/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/cc26x2_cc13x2/Makefile.include b/cpu/cc26x2_cc13x2/Makefile.include
@@ -6,4 +6,3 @@ ROM_LEN ?= 352K
 RAM_LEN ?= 80K
 
 include ${RIOTCPU}/cc26xx_cc13xx/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/efm32/Makefile.include b/cpu/efm32/Makefile.include
@@ -26,5 +26,3 @@ ROM_START_ADDR = $(EFM32_FLASH_START)
 ROM_LEN = $(EFM32_FLASH_SIZE)
 RAM_START_ADDR = $(EFM32_SRAM_START)
 RAM_LEN = $(EFM32_SRAM_SIZE)
-
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/kinetis/Makefile.include b/cpu/kinetis/Makefile.include
@@ -36,5 +36,3 @@ CFLAGS += \
   -DKINETIS_SUBFAMILY=$(KINETIS_SUBFAMILY) \
   -DKINETIS_ROMSIZE=$(KINETIS_ROMSIZE) \
   #
-
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/lm4f120/Makefile.include b/cpu/lm4f120/Makefile.include
@@ -1,3 +1 @@
-include $(RIOTMAKE)/arch/cortexm.inc.mk
-
 include $(RIOTCPU)/stellaris_common/Makefile.include
diff --git a/cpu/lpc1768/Makefile.include b/cpu/lpc1768/Makefile.include
@@ -1 +1 @@
-include $(RIOTMAKE)/arch/cortexm.inc.mk
+# Existence of this file is expected by the build system, even if there is nothing to configure
diff --git a/cpu/mips_pic32mx/Makefile.include b/cpu/mips_pic32mx/Makefile.include
@@ -1,7 +1,6 @@
 export ROMABLE = 1
 
 include $(RIOTCPU)/mips_pic32_common/Makefile.include
-include $(RIOTMAKE)/arch/mips.inc.mk
 
 # define build specific options
 CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM

diff --git a/cpu/mips_pic32mz/Makefile.include b/cpu/mips_pic32mz/Makefile.include
@@ -1,7 +1,6 @@
 export ROMABLE = 1
 
 include $(RIOTCPU)/mips_pic32_common/Makefile.include
-include $(RIOTMAKE)/arch/mips.inc.mk
 
 # define build specific options
 CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM

diff --git a/cpu/msp430_common/Makefile.features b/cpu/msp430_common/Makefile.features
@@ -1,5 +1,5 @@
-CPU_ARCH = msp430
-CPU_CORE = msp430
+CPU_ARCH := msp430
+CPU_CORE := msp430
 
 FEATURES_PROVIDED += arch_16bit
 FEATURES_PROVIDED += arch_msp430

diff --git a/cpu/msp430_common/Makefile.include b/cpu/msp430_common/Makefile.include
@@ -1,6 +1,3 @@
 INCLUDES += -I$(RIOTCPU)/msp430_common/include/
 
 CFLAGS += -DCPU_MODEL_$(call uppercase_and_underscore,$(CPU_MODEL))
-
-# include the msp430 common Makefile
-include $(RIOTMAKE)/arch/msp430.inc.mk
diff --git a/cpu/native/Makefile.features b/cpu/native/Makefile.features
@@ -1,3 +1,5 @@
+CPU_ARCH := native
+
 ifeq (FreeBSD,$(OS))
   DISABLE_LIBSTDCPP ?= 1
 endif

diff --git a/cpu/nrf51/Makefile.include b/cpu/nrf51/Makefile.include
@@ -1,2 +1 @@
 include $(RIOTCPU)/nrf5x_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/nrf52/Makefile.include b/cpu/nrf52/Makefile.include
@@ -43,4 +43,3 @@ LINKER_SCRIPT ?= cortexm.ld
 VECTORS_O ?= $(BINDIR)/nrf52_vectors/vectors_$(CPU_MODEL).o
 
 include $(RIOTCPU)/nrf5x_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/qn908x/Makefile.include b/cpu/qn908x/Makefile.include
@@ -35,5 +35,3 @@ CFLAGS += \
 # include path here.
 PSEUDOMODULES += vendor_%
 INCLUDES += -I$(RIOTCPU)/$(CPU)/include/vendor
-
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/riscv_common/Makefile.include b/cpu/riscv_common/Makefile.include
@@ -22,5 +22,3 @@ ifneq (,$(ITIM_START_ADDR))
 endif
 
 LINKER_SCRIPT ?= riscv.ld
-
-include $(RIOTMAKE)/arch/riscv.inc.mk
diff --git a/cpu/sam3/Makefile.include b/cpu/sam3/Makefile.include
@@ -1,2 +1 @@
 include $(RIOTCPU)/sam_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include
@@ -25,4 +25,3 @@ endif
 CFLAGS += -DCPU_COMMON_SAMD21
 
 include $(RIOTCPU)/sam0_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/samd5x/Makefile.include b/cpu/samd5x/Makefile.include
@@ -16,4 +16,3 @@ BACKUP_RAM_ADDR = 0x47000000
 BACKUP_RAM_LEN  = 0x2000
 
 include $(RIOTCPU)/sam0_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/saml1x/Makefile.include b/cpu/saml1x/Makefile.include
@@ -8,4 +8,3 @@ endif
 CFLAGS += -DCPU_COMMON_SAML1X
 
 include $(RIOTCPU)/sam0_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/saml21/Makefile.include b/cpu/saml21/Makefile.include
@@ -19,4 +19,3 @@ ifneq (,$(filter saml21j18b saml21j18a samr30g18a samr34j18b,$(CPU_MODEL)))
 endif
 
 include $(RIOTCPU)/sam0_common/Makefile.include
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/cpu/stm32/Makefile.include b/cpu/stm32/Makefile.include
@@ -90,5 +90,3 @@ $(STM32IRQS_INCLUDE_FILE): $(STM32FAM_INCLUDE_FILE)
 
 # Include clock configuration directory
 INCLUDES += -I$(RIOTCPU)/stm32/include/clk
-
-include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/makefiles/arch/arm7.inc.mk → makefiles/arch/armv4t.inc.mk b/makefiles/arch/arm7.inc.mk → makefiles/arch/armv4t.inc.mk
diff --git a/makefiles/arch/armv6m.inc.mk b/makefiles/arch/armv6m.inc.mk
@@ -0,0 +1 @@
+include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/makefiles/arch/armv7m.inc.mk b/makefiles/arch/armv7m.inc.mk
@@ -0,0 +1 @@
+include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/makefiles/arch/armv8m.inc.mk b/makefiles/arch/armv8m.inc.mk
@@ -0,0 +1 @@
+include $(RIOTMAKE)/arch/cortexm.inc.mk
diff --git a/makefiles/arch/atmega.inc.mk → makefiles/arch/avr8.inc.mk b/makefiles/arch/atmega.inc.mk → makefiles/arch/avr8.inc.mk
diff --git a/makefiles/arch/mips.inc.mk → makefiles/arch/mips32r2.inc.mk b/makefiles/arch/mips.inc.mk → makefiles/arch/mips32r2.inc.mk
diff --git a/makefiles/arch/riscv.inc.mk → makefiles/arch/risc-v.inc.mk b/makefiles/arch/riscv.inc.mk → makefiles/arch/risc-v.inc.mk
diff --git a/makefiles/arch/esp8266.inc.mk → makefiles/arch/xtensa-lx106.inc.mk b/makefiles/arch/esp8266.inc.mk → makefiles/arch/xtensa-lx106.inc.mk
diff --git a/makefiles/arch/esp32.inc.mk → makefiles/arch/xtensa-lx6.inc.mk b/makefiles/arch/esp32.inc.mk → makefiles/arch/xtensa-lx6.inc.mk
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		INCLUDES += -I$(RIOTBASE)/cpu/arm7_common/include/

		include $(RIOTMAKE)/arch/arm7.inc.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ ROM_LEN ?= 128K
		RAM_LEN ?= 20K

		include ${RIOTCPU}/cc26xx_cc13xx/Makefile.include
		include $(RIOTMAKE)/arch/cortexm.inc.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@ ROM_LEN ?= 352K
		RAM_LEN ?= 80K

		include ${RIOTCPU}/cc26xx_cc13xx/Makefile.include
		include $(RIOTMAKE)/arch/cortexm.inc.mk
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		include $(RIOTMAKE)/arch/cortexm.inc.mk

		include $(RIOTCPU)/stellaris_common/Makefile.include
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include $(RIOTMAKE)/arch/cortexm.inc.mk
		# Existence of this file is expected by the build system, even if there is nothing to configure
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		include $(RIOTCPU)/nrf5x_common/Makefile.include
		include $(RIOTMAKE)/arch/cortexm.inc.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,4 +43,3 @@ LINKER_SCRIPT ?= cortexm.ld
		VECTORS_O ?= $(BINDIR)/nrf52_vectors/vectors_$(CPU_MODEL).o

		include $(RIOTCPU)/nrf5x_common/Makefile.include
		include $(RIOTMAKE)/arch/cortexm.inc.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,5 +22,3 @@ ifneq (,$(ITIM_START_ADDR))
		endif

		LINKER_SCRIPT ?= riscv.ld

		include $(RIOTMAKE)/arch/riscv.inc.mk
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		include $(RIOTCPU)/sam_common/Makefile.include
		include $(RIOTMAKE)/arch/cortexm.inc.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,3 @@ endif
		CFLAGS += -DCPU_COMMON_SAMD21

		include $(RIOTCPU)/sam0_common/Makefile.include
		include $(RIOTMAKE)/arch/cortexm.inc.mk