From 71b6fce711d45f8304fb1a05998e539be708fe00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 13 Nov 2017 15:24:24 +0100 Subject: [PATCH] cpu/mips_pic32_common: prefix modules with mips_pic32_common namespace This prevents clash between modules names cpu and periph with main cpus. Add dependency management in Makefile.include to keep things contained. --- cpu/mips_pic32_common/Makefile.include | 3 +++ cpu/mips_pic32_common/periph/Makefile | 2 ++ cpu/mips_pic32mx/Makefile.include | 2 -- cpu/mips_pic32mz/Makefile.include | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cpu/mips_pic32_common/Makefile.include b/cpu/mips_pic32_common/Makefile.include index 1acfdeb793..0591d55226 100644 --- a/cpu/mips_pic32_common/Makefile.include +++ b/cpu/mips_pic32_common/Makefile.include @@ -1,4 +1,7 @@ export INCLUDES += -I$(RIOTCPU)/mips_pic32_common/include +USEMODULE += mips_pic32_common +USEMODULE += mips_pic32_common_periph + USEMODULE += periph_common USEMODULE += periph_hwrng diff --git a/cpu/mips_pic32_common/periph/Makefile b/cpu/mips_pic32_common/periph/Makefile index a36df249ac..73db0ce651 100644 --- a/cpu/mips_pic32_common/periph/Makefile +++ b/cpu/mips_pic32_common/periph/Makefile @@ -1 +1,3 @@ +MODULE = mips_pic32_common_periph + include $(RIOTMAKE)/periph.mk diff --git a/cpu/mips_pic32mx/Makefile.include b/cpu/mips_pic32mx/Makefile.include index a187cc9224..9c168b18cf 100644 --- a/cpu/mips_pic32mx/Makefile.include +++ b/cpu/mips_pic32mx/Makefile.include @@ -7,8 +7,6 @@ include $(RIOTCPU)/mips32r2_common/Makefile.include # define build specific options export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM -export USEMODULE += mips_pic32_common - export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) export LINKFLAGS += -Tpic32mx512_12_128_uhi.ld diff --git a/cpu/mips_pic32mz/Makefile.include b/cpu/mips_pic32mz/Makefile.include index 6c411558da..5df4e2e0df 100644 --- a/cpu/mips_pic32mz/Makefile.include +++ b/cpu/mips_pic32mz/Makefile.include @@ -8,8 +8,6 @@ include $(RIOTCPU)/mips32r2_common/Makefile.include export CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM export CFLAGS += -DMIPS_MICROMIPS -export USEMODULE += mips_pic32_common - export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) export LINKFLAGS += -Tpic32mz2048_uhi.ld