michaelh/zephyr
1
0
Fork 0
Code Releases Activity

doc|config: Nordic RF5 fix references to SOC_NRF5

Browse source 
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 <inaky.perez-gonzalez@intel.com>
This commit is contained in:
Inaky Perez-Gonzalez 2016-06-14 16:33:26 -07:00
commit 60f5c97dd0
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/soc/nordic_nrf5/Kconfig
View file

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
# #
config SOC_NRF5 config SOC_FAMILY_NRF5
bool bool
# omit prompt to signify a "hidden" option # omit prompt to signify a "hidden" option
default n default n

2
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series
View file

@ -20,7 +20,7 @@ if SOC_SERIES_NRF52X
source "arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52*" source "arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52*"
config SOC_SERIES config SOC_SERIES
default nordic_nrf5/nrf52 default nrf52
config SRAM_BASE_ADDRESS config SRAM_BASE_ADDRESS
default 0x20000000 default 0x20000000