From 60f5c97dd08f813db7202eee30414803b5777135 Mon Sep 17 00:00:00 2001 From: Inaky Perez-Gonzalez Date: Tue, 14 Jun 2016 16:33:26 -0700 Subject: [PATCH] doc|config: Nordic RF5 fix references to SOC_NRF5 There was a reference to SOC_FAMILY_NRF5 which was not use by anyone else and it seemes like it was a typo, where the right reference was to symbol SOC_NRF5. However, the right fix is to move both sites to use SOC_FAMILY_NRF5 *and* fix the SOC_SERIES to be only nrf52, otherwise it causes path duplication and the build fails. This was also causing documentation warnings that are thus killed. Change-Id: I92e74a6158f02df43e6e857df8f1e67bcfdd9551 Signed-off-by: Inaky Perez-Gonzalez --- arch/arm/soc/nordic_nrf5/Kconfig | 2 +- arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/soc/nordic_nrf5/Kconfig b/arch/arm/soc/nordic_nrf5/Kconfig index d982d7f9e07..dbac02d7e62 100644 --- a/arch/arm/soc/nordic_nrf5/Kconfig +++ b/arch/arm/soc/nordic_nrf5/Kconfig @@ -15,7 +15,7 @@ # limitations under the License. # -config SOC_NRF5 +config SOC_FAMILY_NRF5 bool # omit prompt to signify a "hidden" option default n diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series index 9f830630616..bc1eae6f4b7 100644 --- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series +++ b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series @@ -20,7 +20,7 @@ if SOC_SERIES_NRF52X source "arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52*" config SOC_SERIES - default nordic_nrf5/nrf52 + default nrf52 config SRAM_BASE_ADDRESS default 0x20000000