michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: arm: nordic_nrf: Remove duplicates from Kconfig.soc

Browse source 
Removing duplicates in selects for config SOC_NRF52832 and
SOC_NRF52840. Duplicates were unexpected merge artifacts.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2018-12-18 12:49:18 +01:00 • committed by Anas Nashif
commit a6c2c3f0a9
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soc/arm/nordic_nrf/nrf52/Kconfig.soc
View file

@ -45,11 +45,6 @@ config SOC_NRF52810
config SOC_NRF52832 config SOC_NRF52832
depends on SOC_SERIES_NRF52X depends on SOC_SERIES_NRF52X
select HAS_HW_NRF_TIMER0
select HAS_HW_NRF_TIMER1
select HAS_HW_NRF_TIMER2
select HAS_HW_NRF_TIMER3
select HAS_HW_NRF_TIMER4
bool bool
select SOC_COMPATIBLE_NRF52832 select SOC_COMPATIBLE_NRF52832
select CPU_HAS_FPU select CPU_HAS_FPU
@ -116,11 +111,6 @@ config SOC_NRF52832
config SOC_NRF52840 config SOC_NRF52840
depends on SOC_SERIES_NRF52X depends on SOC_SERIES_NRF52X
bool bool
select HAS_HW_NRF_TIMER0
select HAS_HW_NRF_TIMER1
select HAS_HW_NRF_TIMER2
select HAS_HW_NRF_TIMER3
select HAS_HW_NRF_TIMER4
select CPU_HAS_FPU select CPU_HAS_FPU
select HAS_HW_NRF_ACL select HAS_HW_NRF_ACL
select HAS_HW_NRF_CC310 select HAS_HW_NRF_CC310