From 347a0fc804b7cf5fd7a36b7528b6a218b39f841a Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Tue, 8 Oct 2019 15:26:11 +0200 Subject: [PATCH] cpu/ boards/: remove exports for CPU_FAM --- boards/saml10-xpro/Makefile.include | 2 +- boards/saml11-xpro/Makefile.include | 2 +- cpu/efm32/Makefile.include | 2 +- cpu/kinetis/kinetis-info.mk | 6 +++--- cpu/nrf51/Makefile.include | 2 +- cpu/nrf52/Makefile.include | 2 +- cpu/sam3/Makefile.include | 2 +- cpu/samd21/Makefile.include | 2 +- cpu/samd5x/Makefile.include | 2 +- cpu/saml21/Makefile.include | 2 +- cpu/stm32f0/Makefile.include | 2 +- cpu/stm32f1/Makefile.include | 2 +- cpu/stm32f2/Makefile.include | 2 +- cpu/stm32f3/Makefile.include | 2 +- cpu/stm32f4/Makefile.include | 2 +- cpu/stm32f7/Makefile.include | 2 +- cpu/stm32l0/Makefile.include | 2 +- cpu/stm32l1/Makefile.include | 2 +- cpu/stm32l4/Makefile.include | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/boards/saml10-xpro/Makefile.include b/boards/saml10-xpro/Makefile.include index e33947745c67..6901e1f5022e 100644 --- a/boards/saml10-xpro/Makefile.include +++ b/boards/saml10-xpro/Makefile.include @@ -1,4 +1,4 @@ -export CPU_FAM = saml10 +CPU_FAM = saml10 CFLAGS += -D__SAML10E16A__ include $(RIOTBOARD)/common/saml1x/Makefile.include diff --git a/boards/saml11-xpro/Makefile.include b/boards/saml11-xpro/Makefile.include index c24adbef100f..4161a45cf207 100644 --- a/boards/saml11-xpro/Makefile.include +++ b/boards/saml11-xpro/Makefile.include @@ -1,4 +1,4 @@ -export CPU_FAM = saml11 +CPU_FAM = saml11 CFLAGS += -D__SAML11E16A__ include $(RIOTBOARD)/common/saml1x/Makefile.include diff --git a/cpu/efm32/Makefile.include b/cpu/efm32/Makefile.include index b2b8b6095c05..94cdda7a40d1 100644 --- a/cpu/efm32/Makefile.include +++ b/cpu/efm32/Makefile.include @@ -1,7 +1,7 @@ include $(RIOTCPU)/efm32/efm32-info.mk CPU_ARCH = $(EFM32_ARCHITECTURE) -export CPU_FAM = $(EFM32_FAMILY) +CPU_FAM = $(EFM32_FAMILY) # the size of riotboot on the EFM32 exceeds the default value RIOTBOOT_LEN ?= 0x2000 diff --git a/cpu/kinetis/kinetis-info.mk b/cpu/kinetis/kinetis-info.mk index 10e2069cdbdf..8ca1b14ceacb 100644 --- a/cpu/kinetis/kinetis-info.mk +++ b/cpu/kinetis/kinetis-info.mk @@ -32,16 +32,16 @@ export KINETIS_SPEED := $(word 11, $(KINETIS_INFO)) ifeq ($(KINETIS_CORE), Z) # Cortex-M0+ CPU_ARCH = cortex-m0plus - export CPU_FAMILY = klx + CPU_FAMILY = klx else ifeq ($(KINETIS_CORE), D) # Cortex-M4 CPU_ARCH = cortex-m4 - export CPU_FAMILY = kx + CPU_FAMILY = kx else ifeq ($(KINETIS_CORE), F) # Cortex-M4F or Cortex-M7 # TODO: Add floating point support CPU_ARCH = cortex-m4 - export CPU_FAMILY = kx + CPU_FAMILY = kx endif # RAM sizes are a bit arbitrary, but are usually dependent on ROM size and core speed. diff --git a/cpu/nrf51/Makefile.include b/cpu/nrf51/Makefile.include index a841a48a4af9..065e1b5f3eaa 100644 --- a/cpu/nrf51/Makefile.include +++ b/cpu/nrf51/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m0 -export CPU_FAM = nrf51 +CPU_FAM = nrf51 include $(RIOTCPU)/nrf5x_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/nrf52/Makefile.include b/cpu/nrf52/Makefile.include index 03b5b3252791..c6a9ed6913b9 100644 --- a/cpu/nrf52/Makefile.include +++ b/cpu/nrf52/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m4f -export CPU_FAM = nrf52 +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 diff --git a/cpu/sam3/Makefile.include b/cpu/sam3/Makefile.include index f96aef5254c0..6310a1e91361 100644 --- a/cpu/sam3/Makefile.include +++ b/cpu/sam3/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m3 -export CPU_FAM = sam3 +CPU_FAM = sam3 include $(RIOTCPU)/sam_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include index 764cd8129f95..2576ff4ed2bd 100644 --- a/cpu/samd21/Makefile.include +++ b/cpu/samd21/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m0plus -export CPU_FAM = samd21 +CPU_FAM = samd21 USEMODULE += pm_layered diff --git a/cpu/samd5x/Makefile.include b/cpu/samd5x/Makefile.include index f6c2cb81dce5..4484c2497e9e 100644 --- a/cpu/samd5x/Makefile.include +++ b/cpu/samd5x/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m4f -export CPU_FAM = samd5x +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 diff --git a/cpu/saml21/Makefile.include b/cpu/saml21/Makefile.include index 5c8680488ca8..f42f494a78b3 100644 --- a/cpu/saml21/Makefile.include +++ b/cpu/saml21/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m0plus -export CPU_FAM = saml21 +CPU_FAM = saml21 USEMODULE += pm_layered diff --git a/cpu/stm32f0/Makefile.include b/cpu/stm32f0/Makefile.include index c7fad399f47d..5860ac1e33aa 100644 --- a/cpu/stm32f0/Makefile.include +++ b/cpu/stm32f0/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m0 -export CPU_FAM = stm32f0 +CPU_FAM = stm32f0 include $(RIOTCPU)/stm32_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f1/Makefile.include b/cpu/stm32f1/Makefile.include index fe66b4ac02be..572e7a6b5807 100644 --- a/cpu/stm32f1/Makefile.include +++ b/cpu/stm32f1/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m3 -export CPU_FAM = stm32f1 +CPU_FAM = stm32f1 include $(RIOTCPU)/stm32_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f2/Makefile.include b/cpu/stm32f2/Makefile.include index fd58b2f96503..b01f22ed623b 100644 --- a/cpu/stm32f2/Makefile.include +++ b/cpu/stm32f2/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m3 -export CPU_FAM = stm32f2 +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. diff --git a/cpu/stm32f3/Makefile.include b/cpu/stm32f3/Makefile.include index f895935c9e08..e2648b9a5d09 100644 --- a/cpu/stm32f3/Makefile.include +++ b/cpu/stm32f3/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m4f -export CPU_FAM = stm32f3 +CPU_FAM = stm32f3 include $(RIOTCPU)/stm32_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f4/Makefile.include b/cpu/stm32f4/Makefile.include index b9c8dafa549f..5258a494b87e 100644 --- a/cpu/stm32f4/Makefile.include +++ b/cpu/stm32f4/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m4f -export CPU_FAM = stm32f4 +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. diff --git a/cpu/stm32f7/Makefile.include b/cpu/stm32f7/Makefile.include index 853ac515df9e..4d0d5243a478 100644 --- a/cpu/stm32f7/Makefile.include +++ b/cpu/stm32f7/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m7 -export CPU_FAM = stm32f7 +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 diff --git a/cpu/stm32l0/Makefile.include b/cpu/stm32l0/Makefile.include index d2467496bad2..8e09dbaed2ae 100644 --- a/cpu/stm32l0/Makefile.include +++ b/cpu/stm32l0/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m0plus -export CPU_FAM = stm32l0 +CPU_FAM = stm32l0 include $(RIOTCPU)/stm32_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32l1/Makefile.include b/cpu/stm32l1/Makefile.include index bc516511018f..46bb58c51628 100644 --- a/cpu/stm32l1/Makefile.include +++ b/cpu/stm32l1/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m3 -export CPU_FAM = stm32l1 +CPU_FAM = stm32l1 include $(RIOTCPU)/stm32_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32l4/Makefile.include b/cpu/stm32l4/Makefile.include index 24b186cba854..91eae9acdd68 100644 --- a/cpu/stm32l4/Makefile.include +++ b/cpu/stm32l4/Makefile.include @@ -1,5 +1,5 @@ CPU_ARCH = cortex-m4f -export CPU_FAM = stm32l4 +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"