mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #4797 from gebart/pr/nrf51-fix-random-travis-failures
make: Use unique module name for cpu_common periph
This commit is contained in:
commit
9fcb031e21
@ -7,6 +7,9 @@ export LINKFLAGS += -L$(RIOTCPU)/kinetis_common/ldscripts
|
||||
# add the CPU specific code for the linker
|
||||
export UNDEF += $(BINDIR)kinetis_common/fcfield.o
|
||||
|
||||
# include kinetis common periph drivers
|
||||
export USEMODULE += kinetis_common_periph
|
||||
|
||||
# Define a recipe to build the watchdog disable binary, used when flashing
|
||||
$(RIOTCPU)/kinetis_common/dist/wdog-disable.bin: $(RIOTCPU)/kinetis_common/dist/wdog-disable.s
|
||||
$(AD)$(MAKE) -C $(RIOTCPU)/kinetis_common/dist/ $(notdir $@)
|
||||
|
@ -1,3 +1,3 @@
|
||||
MODULE = periph
|
||||
MODULE = kinetis_common_periph
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
@ -2,5 +2,11 @@
|
||||
FAM = $(shell echo $(CPU_FAM) | tr 'a-z-' 'A-Z_')
|
||||
export CFLAGS += -DCPU_FAM_$(FAM)
|
||||
|
||||
# use common periph functions
|
||||
USEMODULE += periph_common
|
||||
|
||||
# include nrf5x common periph drivers
|
||||
USEMODULE += nrf5x_common_periph
|
||||
|
||||
# export the common include directory
|
||||
export INCLUDES += -I$(RIOTCPU)/nrf5x_common/include
|
||||
|
@ -1,3 +1,3 @@
|
||||
MODULE = periph
|
||||
MODULE = nrf5x_common_periph
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
@ -8,5 +8,8 @@ export CFLAGS += -DDONT_USE_CMSIS_INIT
|
||||
# use common periph functions
|
||||
USEMODULE += periph_common
|
||||
|
||||
# include sam21 common periph drivers
|
||||
USEMODULE += sam21_common_periph
|
||||
|
||||
# export the common include directory
|
||||
export INCLUDES += -I$(RIOTCPU)/sam21_common/include
|
||||
|
@ -1,3 +1,3 @@
|
||||
MODULE = periph
|
||||
MODULE = sam21_common_periph
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
@ -2,8 +2,11 @@
|
||||
FAM = $(shell echo $(CPU_FAM) | tr 'a-z-' 'A-Z_')
|
||||
export CFLAGS += -DCPU_FAM_$(FAM)
|
||||
|
||||
# includ common periph module
|
||||
# include common periph module
|
||||
USEMODULE += periph_common
|
||||
|
||||
# include stm32 common periph drivers
|
||||
USEMODULE += stm32_common_periph
|
||||
|
||||
# export the common include directory
|
||||
export INCLUDES += -I$(RIOTCPU)/stm32_common/include
|
||||
|
@ -1,3 +1,3 @@
|
||||
MODULE = periph
|
||||
MODULE = stm32_common_periph
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
Loading…
Reference in New Issue
Block a user