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

cpu/kconfig: Rename CPU classification symbols

Browse Source 
This removes the `CPU_FAMILY` and `CPU_SERIES` common CPU symbols and
adds `CPU_FAM` instead.
This commit is contained in:
Leandro Lanzieri 2020-06-16 14:23:17 +02:00
parent 89570087d8
commit d87f0cc66b
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
4 changed files with 38 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cpu/Kconfig
View File

@ -10,12 +10,7 @@
# || selects # || selects
# \/ # \/
# +------------+ # +------------+
# | CPU_SERIES | # | CPU_FAM |
# +------------+
# || selects
# \/
# +------------+
# | CPU_FAMILY |
# +------------+ # +------------+
# || selects # || selects
# \/ # \/
@ -27,25 +22,25 @@
# +----------+ # +----------+
# | CPU_ARCH | # | CPU_ARCH |
# +----------+ # +----------+
config CPU config CPU
string string
help help
Name of the currently selected CPU. Name of the currently selected CPU. This reflects the Makefile variable
used by the build system as entry point in the cpu folder.
config CPU_MODEL config CPU_MODEL
string string
help help
Model of the currently selected CPU. Model of the currently selected CPU.
config CPU_SERIES config CPU_FAM
string string
help help
Series of the currently selected CPU. Family of the currently selected CPU. It is an identifier that
represents a sub-group of a Manufacturers CPU's. All CPU models
config CPU_FAMILY belonging to the same family, usually share the same core and have
string similar register mapping.
help
Family of the currently selected CPU.
config CPU_CORE config CPU_CORE
string string

18
cpu/cc26x0/Kconfig
View File

@ -5,21 +5,17 @@
# directory for more details. # directory for more details.
# #
config CPU_FAMILY_CC26X0_CC13X0 config CPU_FAM_CC26X0
bool bool
select CPU_CORE_CORTEX_M3 select CPU_CORE_CORTEX_M3
select CPU_COMMON_CC26XX_CC13XX select CPU_COMMON_CC26XX_CC13XX
select HAS_CPU_CC26X0 select HAS_CPU_CC26X0
select HAS_CORTEXM_MPU select HAS_CORTEXM_MPU
config CPU_SERIES_CC26X0
bool
select CPU_FAMILY_CC26X0_CC13X0
## CPU Models ## CPU Models
config CPU_MODEL_CC26X0F128 config CPU_MODEL_CC26X0F128
bool bool
select CPU_SERIES_CC26X0 select CPU_FAM_CC26X0
## Definition of specific features ## Definition of specific features
config HAS_CPU_CC26X0 config HAS_CPU_CC26X0
@ -28,13 +24,13 @@ config HAS_CPU_CC26X0
Indicates that a 'cc26x0' cpu is being used. Indicates that a 'cc26x0' cpu is being used.
## Common CPU symbols ## Common CPU symbols
config CPU_FAMILY config CPU_FAM
default "cc26x0_cc13x0" if CPU_FAMILY_CC26X0_CC13X0 default "cc26x0" if CPU_FAM_CC26X0
config CPU_SERIES
default "cc26x0" if CPU_SERIES_CC26X0
config CPU_MODEL config CPU_MODEL
default "cc26x0f128" if CPU_MODEL_CC26X0F128 default "cc26x0f128" if CPU_MODEL_CC26X0F128
config CPU
default "cc26x0"
source "$(RIOTCPU)/cc26xx_cc13xx/Kconfig" source "$(RIOTCPU)/cc26xx_cc13xx/Kconfig"

24
cpu/cc26x2_cc13x2/Kconfig
View File

@ -5,29 +5,25 @@
# directory for more details. # directory for more details.
# #
config CPU_FAMILY_CC26X2_CC13X2 config CPU_FAM_CC13X2
bool bool
select CPU_CORE_CORTEX_M4F
select CPU_COMMON_CC26XX_CC13XX select CPU_COMMON_CC26XX_CC13XX
select CPU_CORE_CORTEX_M4F
select HAS_CPU_CC26X2_CC13X2 select HAS_CPU_CC26X2_CC13X2
select HAS_CORTEXM_MPU select HAS_CORTEXM_MPU
config CPU_SERIES_CC13X2
bool
select CPU_FAMILY_CC26X2_CC13X2
## CPU Models ## CPU Models
config CPU_MODEL_CC1312R1F3 config CPU_MODEL_CC1312R1F3
bool bool
select CPU_SERIES_CC13X2 select CPU_FAM_CC13X2
config CPU_MODEL_CC1352R1 config CPU_MODEL_CC1352R1
bool bool
select CPU_SERIES_CC13X2 select CPU_FAM_CC13X2
config CPU_MODEL_CC1352P1 config CPU_MODEL_CC1352P1
bool bool
select CPU_SERIES_CC13X2 select CPU_FAM_CC13X2
## Definition of specific features ## Definition of specific features
config HAS_CPU_CC26X2_CC13X2 config HAS_CPU_CC26X2_CC13X2
@ -36,15 +32,15 @@ config HAS_CPU_CC26X2_CC13X2
Indicates that a 'cc26x2_cc13x2' cpu is being used. Indicates that a 'cc26x2_cc13x2' cpu is being used.
## Common CPU symbols ## Common CPU symbols
config CPU_FAMILY config CPU_FAM
default "cc26x2_cc13x2" if CPU_FAMILY_CC26X2_CC13X2 default "cc13x2" if CPU_FAM_CC13X2
config CPU_SERIES
default "cc13x2" if CPU_SERIES_CC13X2
config CPU_MODEL config CPU_MODEL
default "cc1312r1f3" if CPU_MODEL_CC1312R1F3 default "cc1312r1f3" if CPU_MODEL_CC1312R1F3
default "cc1352r1" if CPU_MODEL_CC1352R1 default "cc1352r1" if CPU_MODEL_CC1352R1
default "cc1352p1" if CPU_MODEL_CC1352P1 default "cc1352p1" if CPU_MODEL_CC1352P1
config CPU
default "cc26x2_cc13x2"
source "$(RIOTCPU)/cc26xx_cc13xx/Kconfig" source "$(RIOTCPU)/cc26xx_cc13xx/Kconfig"

28
cpu/samd21/Kconfig
View File

@ -5,37 +5,33 @@
# directory for more details. # directory for more details.
# #
config CPU_FAMILY_SAMD2X config CPU_FAM_SAMD21
bool bool
select CPU_CORE_CORTEX_M0PLUS
select CPU_COMMON_SAM0 select CPU_COMMON_SAM0
select CPU_CORE_CORTEX_M0PLUS
config CPU_SERIES_SAMD21
bool
select CPU_FAMILY_SAMD2X
select HAS_CPU_SAMD21 select HAS_CPU_SAMD21
select HAS_PUF_SRAM select HAS_PUF_SRAM
## CPU Models ## CPU Models
config CPU_MODEL_SAMD21E18A config CPU_MODEL_SAMD21E18A
bool bool
select CPU_SERIES_SAMD21 select CPU_FAM_SAMD21
config CPU_MODEL_SAMD21G18A config CPU_MODEL_SAMD21G18A
bool bool
select CPU_SERIES_SAMD21 select CPU_FAM_SAMD21
config CPU_MODEL_SAMD21J18A config CPU_MODEL_SAMD21J18A
bool bool
select CPU_SERIES_SAMD21 select CPU_FAM_SAMD21
config CPU_MODEL_SAMR21E18A config CPU_MODEL_SAMR21E18A
bool bool
select CPU_SERIES_SAMD21 select CPU_FAM_SAMD21
config CPU_MODEL_SAMR21G18A config CPU_MODEL_SAMR21G18A
bool bool
select CPU_SERIES_SAMD21 select CPU_FAM_SAMD21
## Definition of specific features ## Definition of specific features
config HAS_CPU_SAMD21 config HAS_CPU_SAMD21
@ -44,11 +40,8 @@ config HAS_CPU_SAMD21
Indicates that a 'samd21' cpu is being used. Indicates that a 'samd21' cpu is being used.
## Common CPU symbols ## Common CPU symbols
config CPU_FAMILY config CPU_FAM
default "samd2x" if CPU_FAMILY_SAMD2X default "samd21" if CPU_FAM_SAMD21
config CPU_SERIES
default "samd21" if CPU_SERIES_SAMD21
config CPU_MODEL config CPU_MODEL
default "samd21e18a" if CPU_MODEL_SAMD21E18A default "samd21e18a" if CPU_MODEL_SAMD21E18A
@ -57,4 +50,7 @@ config CPU_MODEL
default "samr21e18a" if CPU_MODEL_SAMR21E18A default "samr21e18a" if CPU_MODEL_SAMR21E18A
default "samr21g18a" if CPU_MODEL_SAMR21G18A default "samr21g18a" if CPU_MODEL_SAMR21G18A
config CPU
default "samd21"
source "$(RIOTCPU)/sam0_common/Kconfig" source "$(RIOTCPU)/sam0_common/Kconfig"