arch/nrfxx: unify Make.defs

This commit is contained in:
raiden00pl 2023-07-10 10:01:30 +02:00 committed by Xiang Xiao
parent fef52b11ee
commit 409cb61d49
3 changed files with 51 additions and 60 deletions

View File

@ -20,18 +20,18 @@
include armv7-m/Make.defs
ifeq ($(CONFIG_NRF52_SYSTIMER_SYSTICK),y)
CHIP_CSRCS += nrf52_systick.c
else
ifeq ($(CONFIG_NRF52_SYSTIMER_RTC),y)
CHIP_CSRCS += nrf52_tickless_rtc.c
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
CHIP_CSRCS += nrf52_uid.c
ifeq ($(CONFIG_NRF52_SYSTIMER_SYSTICK),y)
CHIP_CSRCS += nrf52_systick.c
endif
ifeq ($(CONFIG_NRF52_SYSTIMER_RTC),y)
CHIP_CSRCS += nrf52_tickless_rtc.c
endif
ifeq ($(CONFIG_ALLOW_BSD_COMPONENTS),y)
CHIP_CSRCS += nrf52_nvmc.c
ifeq ($(CONFIG_NRF52_PROGMEM),y)
@ -149,9 +149,7 @@ endif
CHIP_CSRCS += nrf52_sdc.c
NRFX_DIR = $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)nrfx
NRFXLIB_DIR = $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)sdk-nrfxlib
CMSIS_DIR = $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)CMSIS_5
INCLUDES += \
${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)sdc \

View File

@ -20,20 +20,20 @@
include armv8-m/Make.defs
ifeq ($(CONFIG_NRF53_SYSTIMER_SYSTICK),y)
CHIP_CSRCS += nrf53_systick.c
else
ifeq ($(CONFIG_NRF53_SYSTIMER_RTC),y)
CHIP_CSRCS += nrf53_tickless_rtc.c
endif
endif
CHIP_CSRCS += nrf53_start.c nrf53_clockconfig.c nrf53_irq.c nrf53_utils.c
CHIP_CSRCS += nrf53_allocateheap.c nrf53_lowputc.c nrf53_gpio.c
CHIP_CSRCS += nrf53_uid.c
ifeq ($(CONFIG_NRF53_SYSTIMER_SYSTICK),y)
CHIP_CSRCS += nrf53_systick.c
endif
ifeq ($(CONFIG_NRF53_SYSTIMER_RTC),y)
CHIP_CSRCS += nrf53_tickless_rtc.c
endif
ifeq ($(CONFIG_NRF53_APPCORE),y)
CHIP_CSRCS += nrf53_oscconfig.c
CHIP_CSRCS += nrf53_oscconfig.c nrf53_cpunet.c
endif
ifeq ($(CONFIG_NRF53_PROGMEM),y)
@ -52,16 +52,12 @@ ifeq ($(CONFIG_NRF53_UART),y)
CHIP_CSRCS += nrf53_serial.c
endif
ifeq ($(CONFIG_NRF53_APPCORE),y)
CHIP_CSRCS += nrf53_cpunet.c
ifeq ($(CONFIG_NRF53_SPI_MASTER),y)
CHIP_CSRCS += nrf53_spi.c
endif
ifeq ($(CONFIG_NRF53_IPC),y)
CHIP_CSRCS += nrf53_ipc.c
endif
ifeq ($(CONFIG_RPTUN),y)
CHIP_CSRCS += nrf53_rptun.c
ifeq ($(CONFIG_NRF53_I2C_MASTER),y)
CHIP_CSRCS += nrf53_i2c.c
endif
ifeq ($(CONFIG_NRF53_TIMER),y)
@ -71,6 +67,10 @@ CHIP_CSRCS += nrf53_tim_lowerhalf.c
endif
endif
ifeq ($(CONFIG_NRF53_RTC),y)
CHIP_CSRCS += nrf53_rtc.c
endif
ifeq ($(CONFIG_NRF53_PWM),y)
CHIP_CSRCS += nrf53_pwm.c
endif
@ -79,20 +79,16 @@ ifeq ($(CONFIG_NRF53_SAADC),y)
CHIP_CSRCS += nrf53_adc.c
endif
ifeq ($(CONFIG_NRF53_RTC),y)
CHIP_CSRCS += nrf53_rtc.c
endif
ifeq ($(CONFIG_NRF53_SPI_MASTER),y)
CHIP_CSRCS += nrf53_spi.c
endif
ifeq ($(CONFIG_PM),y)
CHIP_CSRCS += nrf53_pminitialize.c
endif
ifeq ($(CONFIG_NRF53_I2C_MASTER),y)
CHIP_CSRCS += nrf53_i2c.c
ifeq ($(CONFIG_NRF53_IPC),y)
CHIP_CSRCS += nrf53_ipc.c
endif
ifeq ($(CONFIG_RPTUN),y)
CHIP_CSRCS += nrf53_rptun.c
endif
ifeq ($(CONFIG_USBDEV),y)
@ -130,9 +126,7 @@ endif
CHIP_CSRCS += nrf53_sdc.c
NRFX_DIR = $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)nrfx
NRFXLIB_DIR = $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)sdk-nrfxlib
CMSIS_DIR = $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)CMSIS_5
INCLUDES += \
${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)sdc \

View File

@ -20,18 +20,18 @@
include armv8-m/Make.defs
ifeq ($(CONFIG_NRF91_SYSTIMER_SYSTICK),y)
CHIP_CSRCS += nrf91_systick.c
else
ifeq ($(CONFIG_NRF91_SYSTIMER_RTC),y)
CHIP_CSRCS += nrf91_tickless_rtc.c
endif
endif
CHIP_CSRCS += nrf91_start.c nrf91_clockconfig.c nrf91_irq.c nrf91_utils.c
CHIP_CSRCS += nrf91_allocateheap.c nrf91_lowputc.c nrf91_gpio.c
CHIP_CSRCS += nrf91_uid.c nrf91_spu.c nrf91_errata.c
ifeq ($(CONFIG_NRF91_SYSTIMER_SYSTICK),y)
CHIP_CSRCS += nrf91_systick.c
endif
ifeq ($(CONFIG_NRF91_SYSTIMER_RTC),y)
CHIP_CSRCS += nrf91_tickless_rtc.c
endif
ifeq ($(CONFIG_NRF91_PROGMEM),y)
CHIP_CSRCS += nrf91_flash.c
endif
@ -48,6 +48,14 @@ ifeq ($(CONFIG_NRF91_UART),y)
CHIP_CSRCS += nrf91_serial.c
endif
ifeq ($(CONFIG_NRF91_SPI_MASTER),y)
CHIP_CSRCS += nrf91_spi.c
endif
ifeq ($(CONFIG_NRF91_I2C_MASTER),y)
CHIP_CSRCS += nrf91_i2c.c
endif
ifeq ($(CONFIG_NRF91_TIMER),y)
CHIP_CSRCS += nrf91_tim.c
ifeq ($(CONFIG_TIMER),y)
@ -55,6 +63,10 @@ CHIP_CSRCS += nrf91_tim_lowerhalf.c
endif
endif
ifeq ($(CONFIG_NRF91_RTC),y)
CHIP_CSRCS += nrf91_rtc.c
endif
ifeq ($(CONFIG_NRF91_PWM),y)
CHIP_CSRCS += nrf91_pwm.c
endif
@ -63,22 +75,10 @@ ifeq ($(CONFIG_NRF91_SAADC),y)
CHIP_CSRCS += nrf91_adc.c
endif
ifeq ($(CONFIG_NRF91_RTC),y)
CHIP_CSRCS += nrf91_rtc.c
endif
ifeq ($(CONFIG_NRF91_SPI_MASTER),y)
CHIP_CSRCS += nrf91_spi.c
endif
ifeq ($(CONFIG_PM),y)
CHIP_CSRCS += nrf91_pminitialize.c
endif
ifeq ($(CONFIG_NRF91_I2C_MASTER),y)
CHIP_CSRCS += nrf91_i2c.c
endif
ifeq ($(CONFIG_NRF91_MODEM),y)
NRFXLIB_UNPACK := sdk-nrfxlib
@ -130,5 +130,4 @@ else
EXTRA_LIBS += -lmodem
endif
endif