sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/nrf52: remove redundant chip definitions from Kconfig

Browse Source
This commit is contained in:
raiden00pl 2020-08-31 07:39:45 +02:00 committed by Matias N
parent 45f3aa4ca9
commit 3241ebf811
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/include/nrf52/irq.h
View File

@ -77,7 +77,11 @@
/* Cortex-M4 External interrupts (vectors >= 16) */ /* Cortex-M4 External interrupts (vectors >= 16) */
#if defined(CONFIG_ARCH_FAMILY_NRF52832) || defined(CONFIG_ARCH_FAMILY_NRF52840) /********************************************************************************************
* Included Files
********************************************************************************************/
#if defined(CONFIG_ARCH_FAMILY_NRF52)
# include <arch/nrf52/nrf52_irq.h> # include <arch/nrf52/nrf52_irq.h>
#else #else
# error "Unsupported NRF52XX MCU" # error "Unsupported NRF52XX MCU"

17
arch/arm/src/nrf52/Kconfig
View File

@ -13,13 +13,11 @@ choice
config ARCH_CHIP_NRF52832 config ARCH_CHIP_NRF52832
bool "NRF52832" bool "NRF52832"
select ARCH_FAMILY_NRF52 select ARCH_FAMILY_NRF52
select ARCH_FAMILY_NRF52832
select NRF52_HAVE_BPROT select NRF52_HAVE_BPROT
config ARCH_CHIP_NRF52833 config ARCH_CHIP_NRF52833
bool "NRF52832" bool "NRF52832"
select ARCH_FAMILY_NRF52 select ARCH_FAMILY_NRF52
select ARCH_FAMILY_NRF52833
select NRF52_HAVE_ACL select NRF52_HAVE_ACL
select NRF52_HAVE_UART1 select NRF52_HAVE_UART1
select NRF52_HAVE_PORT1 select NRF52_HAVE_PORT1
@ -30,7 +28,6 @@ config ARCH_CHIP_NRF52833
config ARCH_CHIP_NRF52840 config ARCH_CHIP_NRF52840
bool "NRF52840" bool "NRF52840"
select ARCH_FAMILY_NRF52 select ARCH_FAMILY_NRF52
select ARCH_FAMILY_NRF52840
select NRF52_HAVE_ACL select NRF52_HAVE_ACL
select NRF52_HAVE_UART1 select NRF52_HAVE_UART1
select NRF52_HAVE_PORT1 select NRF52_HAVE_PORT1
@ -48,18 +45,6 @@ config ARCH_FAMILY_NRF52
bool bool
default n default n
config ARCH_FAMILY_NRF52832
bool
default n
config ARCH_FAMILY_NRF52833
bool
default n
config ARCH_FAMILY_NRF52840
bool
default n
# Peripheral support # Peripheral support
config NRF52_HAVE_BPROT config NRF52_HAVE_BPROT
@ -122,7 +107,7 @@ config NRF52_RTC
config NRF52_SPI_MASTER_WORKAROUND_1BYTE_TRANSFER config NRF52_SPI_MASTER_WORKAROUND_1BYTE_TRANSFER
bool "SPI Master 1 Byte transfer anomaly workaround" bool "SPI Master 1 Byte transfer anomaly workaround"
depends on NRF52_SPI_MASTER && ARCH_FAMILY_NRF52832 depends on NRF52_SPI_MASTER && ARCH_CHIP_NRF52832
default y default y
---help--- ---help---
Enable the workaround to fix SPI Master 1 byte transfer bug Enable the workaround to fix SPI Master 1 byte transfer bug

2
arch/arm/src/nrf52/Make.defs
View File

@ -80,7 +80,7 @@ endif
CHIP_CSRCS = nrf52_start.c nrf52_clockconfig.c nrf52_irq.c nrf52_utils.c CHIP_CSRCS = nrf52_start.c nrf52_clockconfig.c nrf52_irq.c nrf52_utils.c
CHIP_CSRCS += nrf52_allocateheap.c nrf52_lowputc.c nrf52_gpio.c nrf52_nvmc.c CHIP_CSRCS += nrf52_allocateheap.c nrf52_lowputc.c nrf52_gpio.c nrf52_nvmc.c
ifeq ($(CONFIG_ARCH_FAMILY_NRF52832),y) ifeq ($(CONFIG_ARCH_CHIP_NRF52832),y)
CHIP_CSRCS += nrf52832_errdata.c CHIP_CSRCS += nrf52832_errdata.c
endif endif

2
arch/arm/src/nrf52/nrf52_start.c
View File

@ -222,7 +222,7 @@ void __start(void)
showprogress('C'); showprogress('C');
#if defined(CONFIG_ARCH_FAMILY_NRF52832) #if defined(CONFIG_ARCH_CHIP_NRF52832)
/* Initialize the errdata work-around */ /* Initialize the errdata work-around */
nrf52832_errdata_init(); nrf52832_errdata_init();