michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: nrf52: Introduce NRF52 SoC Specific config options

Browse source 
Introduce SoC specific config options similar to what exists on NRF51,
this is mostly to help distinguish between SRAM & Flash sizes on
different variants.

Also deleted some unnecessary setting of CONFIG_SOC_NRF528{32,40} in the
board defconfig files.

Change-Id: I3aaedf0c15423ae12636f87b8e6a39070cbb2c6f
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2017-04-11 11:24:45 -05:00
commit 6959c4516e
10 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832 → arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA
View file

@ -6,11 +6,11 @@
# #
if SOC_NRF52832 if SOC_NRF52832_QFAA
config SOC config SOC
string string
default nRF52832 default nRF52832_QFAA
config SRAM_SIZE config SRAM_SIZE
default 64 default 64
@ -22,5 +22,5 @@ config NUM_IRQS
int int
default 39 default 39
endif # SOC_NRF52832 endif # SOC_NRF52832_QFAA

6
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840 → arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
View file

@ -6,11 +6,11 @@
# #
if SOC_NRF52840 if SOC_NRF52840_QIAA
config SOC config SOC
string string
default nRF52840 default nRF52840_QIAA
config SRAM_SIZE config SRAM_SIZE
default 256 default 256
@ -22,5 +22,5 @@ config NUM_IRQS
int int
default 46 default 46
endif # SOC_NRF52840 endif # SOC_NRF52840_QIAA

18
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc
View file

@ -5,14 +5,24 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
config SOC_NRF52832
depends on SOC_SERIES_NRF52X
bool
config SOC_NRF52840
depends on SOC_SERIES_NRF52X
bool
choice choice
prompt "nRF52x MCU Selection" prompt "nRF52x MCU Selection"
depends on SOC_SERIES_NRF52X depends on SOC_SERIES_NRF52X
config SOC_NRF52832 config SOC_NRF52832_QFAA
bool "NRF52832" bool "NRF52832_QFAA"
select SOC_NRF52832
config SOC_NRF52840 config SOC_NRF52840_QIAA
bool "NRF52840" bool "NRF52840_QIAA"
select SOC_NRF52840
endchoice endchoice

2
boards/arm/96b_nitrogen/Kconfig.board
View file

@ -6,4 +6,4 @@
config BOARD_96B_NITROGEN config BOARD_96B_NITROGEN
bool "96Boards Nitrogen" bool "96Boards Nitrogen"
depends on SOC_NRF52832 depends on SOC_NRF52832_QFAA

2
boards/arm/nrf52840_pca10056/Kconfig.board
View file

@ -6,4 +6,4 @@
config BOARD_NRF52840_PCA10056 config BOARD_NRF52840_PCA10056
bool "NRF52840 PCA10056" bool "NRF52840 PCA10056"
depends on SOC_NRF52840 depends on SOC_NRF52840_QIAA

2
boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SOC_FAMILY_NRF5=y CONFIG_SOC_FAMILY_NRF5=y
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840=y CONFIG_SOC_NRF52840_QIAA=y
CONFIG_BOARD_NRF52840_PCA10056=y CONFIG_BOARD_NRF52840_PCA10056=y
# enable uart driver # enable uart driver

2
boards/arm/nrf52_blenano2/Kconfig.board
View file

@ -7,4 +7,4 @@
config BOARD_NRF52_BLENANO2 config BOARD_NRF52_BLENANO2
bool "nRF52 BLENANO2" bool "nRF52 BLENANO2"
depends on SOC_NRF52832 depends on SOC_NRF52832_QFAA

2
boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SOC_FAMILY_NRF5=y CONFIG_SOC_FAMILY_NRF5=y
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52832=y CONFIG_SOC_NRF52832_QFAA=y
CONFIG_BOARD_NRF52_BLENANO2=y CONFIG_BOARD_NRF52_BLENANO2=y
# enable uart driver # enable uart driver

2
boards/arm/nrf52_pca10040/Kconfig.board
View file

@ -6,4 +6,4 @@
config BOARD_NRF52_PCA10040 config BOARD_NRF52_PCA10040
bool "nRF52 PCA10040" bool "nRF52 PCA10040"
depends on SOC_NRF52832 depends on SOC_NRF52832_QFAA

2
boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SOC_FAMILY_NRF5=y CONFIG_SOC_FAMILY_NRF5=y
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52832=y CONFIG_SOC_NRF52832_QFAA=y
CONFIG_BOARD_NRF52_PCA10040=y CONFIG_BOARD_NRF52_PCA10040=y
# enable uart driver # enable uart driver