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

Merge pull request #12397 from fjmolinas/pr_CPU_ARCH_FAM

Browse Source 
makefiles/vars.inc.mk: move definition and export of CPU_FAM and CPU_ARCH to vars.inc.mk
This commit is contained in:
Alexandre Abadie 2019-10-21 08:23:51 +02:00 committed by GitHub
commit 5578740fc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/saml10-xpro/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU_FAM = saml10
CPU_FAM = saml10
CFLAGS += -D__SAML10E16A__
include $(RIOTBOARD)/common/saml1x/Makefile.include

2
boards/saml11-xpro/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU_FAM = saml11
CPU_FAM = saml11
CFLAGS += -D__SAML11E16A__
include $(RIOTBOARD)/common/saml1x/Makefile.include

2
cpu/cc2538/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH := cortex-m3
CPU_ARCH = cortex-m3
include $(RIOTMAKE)/arch/cortexm.inc.mk

2
cpu/cc26x0/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH := cortex-m3
CPU_ARCH = cortex-m3
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/efm32/Makefile.include
View File

@ -1,7 +1,7 @@
include $(RIOTCPU)/efm32/efm32-info.mk
export CPU_ARCH = $(EFM32_ARCHITECTURE)
export CPU_FAM = $(EFM32_FAMILY)
CPU_ARCH = $(EFM32_ARCHITECTURE)
CPU_FAM = $(EFM32_FAMILY)
# the size of riotboot on the EFM32 exceeds the default value
RIOTBOOT_LEN ?= 0x2000

2
cpu/ezr32wg/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH = cortex-m4f
CPU_ARCH = cortex-m4f
include $(RIOTMAKE)/arch/cortexm.inc.mk

12
cpu/kinetis/kinetis-info.mk
View File

@ -31,17 +31,17 @@ export KINETIS_SPEED := $(word 11, $(KINETIS_INFO))
ifeq ($(KINETIS_CORE), Z)
# Cortex-M0+
export CPU_ARCH = cortex-m0plus
export CPU_FAMILY = klx
CPU_ARCH = cortex-m0plus
CPU_FAMILY = klx
else ifeq ($(KINETIS_CORE), D)
# Cortex-M4
export CPU_ARCH = cortex-m4
export CPU_FAMILY = kx
CPU_ARCH = cortex-m4
CPU_FAMILY = kx
else ifeq ($(KINETIS_CORE), F)
# Cortex-M4F or Cortex-M7
# TODO: Add floating point support
export CPU_ARCH = cortex-m4
export CPU_FAMILY = kx
CPU_ARCH = cortex-m4
CPU_FAMILY = kx
endif
# RAM sizes are a bit arbitrary, but are usually dependent on ROM size and core speed.

2
cpu/lm4f120/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU_ARCH = cortex-m4f
CPU_ARCH = cortex-m4f
include $(RIOTMAKE)/arch/cortexm.inc.mk

2
cpu/lpc1768/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU_ARCH = cortex-m3
CPU_ARCH = cortex-m3
USEMODULE += pm_layered

4
cpu/nrf51/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m0
export CPU_FAM = nrf51
CPU_ARCH = cortex-m0
CPU_FAM = nrf51
include $(RIOTCPU)/nrf5x_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/nrf52/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m4f
export CPU_FAM = nrf52
CPU_ARCH = cortex-m4f
CPU_FAM = nrf52
# Slot size is determined by "((total_flash_size - RIOTBOOT_LEN) / 2)".
# If RIOTBOOT_LEN uses an uneven number of flashpages, the remainder of the

4
cpu/sam3/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m3
export CPU_FAM = sam3
CPU_ARCH = cortex-m3
CPU_FAM = sam3
include $(RIOTCPU)/sam_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/samd21/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m0plus
export CPU_FAM = samd21
CPU_ARCH = cortex-m0plus
CPU_FAM = samd21
USEMODULE += pm_layered

4
cpu/samd5x/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m4f
export CPU_FAM = samd5x
CPU_ARCH = cortex-m4f
CPU_FAM = samd5x
# Slot size is determined by "((total_flash_size - RIOTBOOT_LEN) / 2)".
# If RIOTBOOT_LEN uses an uneven number of flashpages, the remainder of the

2
cpu/saml1x/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU_ARCH = cortex-m23
CPU_ARCH = cortex-m23
USEMODULE += pm_layered

4
cpu/saml21/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m0plus
export CPU_FAM = saml21
CPU_ARCH = cortex-m0plus
CPU_FAM = saml21
USEMODULE += pm_layered

4
cpu/stm32f0/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m0
export CPU_FAM = stm32f0
CPU_ARCH = cortex-m0
CPU_FAM = stm32f0
include $(RIOTCPU)/stm32_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/stm32f1/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m3
export CPU_FAM = stm32f1
CPU_ARCH = cortex-m3
CPU_FAM = stm32f1
include $(RIOTCPU)/stm32_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/stm32f2/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m3
export CPU_FAM = stm32f2
CPU_ARCH = cortex-m3
CPU_FAM = stm32f2
# STM32F2 uses sectors instead of pages, where the minimum sector length is 16KB
# (the first sector), therefore RIOTBOOT_LEN must be 16KB to cover a whole sector.

4
cpu/stm32f3/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m4f
export CPU_FAM = stm32f3
CPU_ARCH = cortex-m4f
CPU_FAM = stm32f3
include $(RIOTCPU)/stm32_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/stm32f4/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m4f
export CPU_FAM = stm32f4
CPU_ARCH = cortex-m4f
CPU_FAM = stm32f4
# STM32F4 uses sectors instead of pages, where the minimum sector length is 16KB
# (the first sector), therefore RIOTBOOT_LEN must be 16KB to cover a whole sector.

4
cpu/stm32f7/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m7
export CPU_FAM = stm32f7
CPU_ARCH = cortex-m7
CPU_FAM = stm32f7
# STM32F7 uses sectors instead of pages, where the minimum sector length is 16KB or
# 32kB (the first sector), depending on the CPU_MODEL. Therefore RIOTBOOT_LEN must

4
cpu/stm32l0/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m0plus
export CPU_FAM = stm32l0
CPU_ARCH = cortex-m0plus
CPU_FAM = stm32l0
include $(RIOTCPU)/stm32_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/stm32l1/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m3
export CPU_FAM = stm32l1
CPU_ARCH = cortex-m3
CPU_FAM = stm32l1
include $(RIOTCPU)/stm32_common/Makefile.include
include $(RIOTMAKE)/arch/cortexm.inc.mk

4
cpu/stm32l4/Makefile.include
View File

@ -1,5 +1,5 @@
export CPU_ARCH = cortex-m4f
export CPU_FAM = stm32l4
CPU_ARCH = cortex-m4f
CPU_FAM = stm32l4
# "The Vector table must be naturally aligned to a power of two whose alignment
# value is greater than or equal to number of Exceptions supported x 4"

2
dist/tools/buildsystem_sanity_check/check.sh vendored
View File

@ -81,6 +81,8 @@ UNEXPORTED_VARIABLES+=('PORT_LINUX' 'PORT_DARWIN')
UNEXPORTED_VARIABLES+=('PORT[ ?=:]' 'PORT$')
EXPORTED_VARIABLES_ONLY_IN_VARS=()
EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_ARCH')
EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_FAM')
check_not_exporting_variables() {
local patterns=()
local pathspec=()

2
makefiles/vars.inc.mk
View File

@ -10,6 +10,8 @@ export APPLICATION_MODULE # The application module name.
export BOARD # The board to compile the application for.
export CPU # The CPU, set by the board's Makefile.features.
export CPU_MODEL # The specific identifier of the used CPU, used for some CPU implementations to differentiate between different memory layouts. Set by the board's Makefile.features.
export CPU_ARCH # The specific identifier of the core present in the CPU, used currently only for ARM CPU's. Needed for depency resolution.
export CPU_FAM # An intermediate identifier between CPU and CPU_MODEL that represents a sub-group of a Manufacturers CPU's.
export MCU # The MCU, set by the board's Makefile.include, or defaulted to the same value as CPU.
export INCLUDES # The extra include paths, set by the various Makefile.include files.
export CXXINCLUDES # The extra include paths for c++, set by the various Makefile.include files.