arch/nrf52: nvmc and flash should depends on ALLOW_BSD_COMPONENTS=y

This commit is contained in:
raiden00pl 2023-03-15 10:51:08 +01:00 committed by Xiang Xiao
parent a69c6c1dac
commit c70c178a7d
4 changed files with 21 additions and 5 deletions

View File

@ -385,6 +385,7 @@ config NRF52_FLASH_PREFETCH
config NRF52_PROGMEM
bool "FLASH program memory"
depends on ALLOW_BSD_COMPONENTS
default n
select ARCH_HAVE_PROGMEM
---help---

View File

@ -29,9 +29,16 @@ endif
endif
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
CHIP_CSRCS += nrf52_uid.c
ifeq ($(CONFIG_ALLOW_BSD_COMPONENTS),y)
CHIP_CSRCS += nrf52_nvmc.c
ifeq ($(CONFIG_NRF52_PROGMEM),y)
CHIP_CSRCS += nrf52_flash.c
endif
endif
ifeq ($(CONFIG_ARCH_CHIP_NRF52832),y)
CHIP_CSRCS += nrf52832_errdata.c
endif
@ -52,10 +59,6 @@ ifeq ($(CONFIG_NRF52_UART),y)
CHIP_CSRCS += nrf52_serial.c
endif
ifeq ($(CONFIG_NRF52_PROGMEM),y)
CHIP_CSRCS += nrf52_flash.c
endif
ifeq ($(CONFIG_NRF52_WDT),y)
CHIP_CSRCS += nrf52_wdt.c

View File

@ -61,6 +61,10 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef CONFIG_ALLOW_BSD_COMPONENTS
# error "This file requires Kconfig ALLOW_BSD_COMPONENTS"
#endif
#define NRF52_FLASH_PAGE_SIZE (4*1024)
#define NRF52_FLASH_ERASEDVAL (0xffu)

View File

@ -53,6 +53,14 @@
#include "hardware/nrf52_nvmc.h"
#include "nrf52_nvmc.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef CONFIG_ALLOW_BSD_COMPONENTS
# error "This file requires Kconfig ALLOW_BSD_COMPONENTS"
#endif
/****************************************************************************
* Private Functions
****************************************************************************/