From f8eaff4bbed10e7728d99c9976e8b53de949d31d Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 13 Jan 2017 13:33:32 +0100 Subject: [PATCH] cpu: moved msp430-common to msp430_common --- cpu/cc430/Makefile | 2 +- cpu/cc430/Makefile.include | 2 +- cpu/{msp430-common => msp430_common}/Makefile | 0 cpu/{msp430-common => msp430_common}/Makefile.include | 2 +- cpu/{msp430-common => msp430_common}/cpu.c | 0 cpu/{msp430-common => msp430_common}/include/cpu.h | 0 cpu/{msp430-common => msp430_common}/include/cpu_conf.h | 0 cpu/{msp430-common => msp430_common}/include/msp430_types.h | 0 cpu/{msp430-common => msp430_common}/include/stdio.h | 0 cpu/{msp430-common => msp430_common}/include/stdlib.h | 0 cpu/{msp430-common => msp430_common}/include/sys/time.h | 0 cpu/{msp430-common => msp430_common}/include/sys/types.h | 0 cpu/{msp430-common => msp430_common}/include/time.h | 0 cpu/{msp430-common => msp430_common}/include/unistd.h | 0 cpu/{msp430-common => msp430_common}/irq.c | 0 cpu/{msp430-common => msp430_common}/msp430-main.c | 0 cpu/{msp430-common => msp430_common}/startup.c | 0 cpu/msp430fxyz/Makefile | 2 +- cpu/msp430fxyz/Makefile.include | 2 +- 19 files changed, 5 insertions(+), 5 deletions(-) rename cpu/{msp430-common => msp430_common}/Makefile (100%) rename cpu/{msp430-common => msp430_common}/Makefile.include (81%) rename cpu/{msp430-common => msp430_common}/cpu.c (100%) rename cpu/{msp430-common => msp430_common}/include/cpu.h (100%) rename cpu/{msp430-common => msp430_common}/include/cpu_conf.h (100%) rename cpu/{msp430-common => msp430_common}/include/msp430_types.h (100%) rename cpu/{msp430-common => msp430_common}/include/stdio.h (100%) rename cpu/{msp430-common => msp430_common}/include/stdlib.h (100%) rename cpu/{msp430-common => msp430_common}/include/sys/time.h (100%) rename cpu/{msp430-common => msp430_common}/include/sys/types.h (100%) rename cpu/{msp430-common => msp430_common}/include/time.h (100%) rename cpu/{msp430-common => msp430_common}/include/unistd.h (100%) rename cpu/{msp430-common => msp430_common}/irq.c (100%) rename cpu/{msp430-common => msp430_common}/msp430-main.c (100%) rename cpu/{msp430-common => msp430_common}/startup.c (100%) diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile index bea70e4d1d..d523ddf700 100644 --- a/cpu/cc430/Makefile +++ b/cpu/cc430/Makefile @@ -1,5 +1,5 @@ MODULE = cpu -DIRS = $(RIOTCPU)/msp430-common periph +DIRS = $(RIOTCPU)/msp430_common periph include $(RIOTBASE)/Makefile.base diff --git a/cpu/cc430/Makefile.include b/cpu/cc430/Makefile.include index 4cf199e20f..afe6a4b200 100644 --- a/cpu/cc430/Makefile.include +++ b/cpu/cc430/Makefile.include @@ -1,5 +1,5 @@ INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/ -include $(RIOTCPU)/msp430-common/Makefile.include +include $(RIOTCPU)/msp430_common/Makefile.include export USEMODULE += periph diff --git a/cpu/msp430-common/Makefile b/cpu/msp430_common/Makefile similarity index 100% rename from cpu/msp430-common/Makefile rename to cpu/msp430_common/Makefile diff --git a/cpu/msp430-common/Makefile.include b/cpu/msp430_common/Makefile.include similarity index 81% rename from cpu/msp430-common/Makefile.include rename to cpu/msp430_common/Makefile.include index d3623ced67..f1795adfd0 100644 --- a/cpu/msp430-common/Makefile.include +++ b/cpu/msp430_common/Makefile.include @@ -1,4 +1,4 @@ -INCLUDES += -I$(RIOTCPU)/msp430-common/include/ +INCLUDES += -I$(RIOTCPU)/msp430_common/include/ export UNDEF += $(BINDIR)/msp430_common/startup.o export USEMODULE += msp430_common diff --git a/cpu/msp430-common/cpu.c b/cpu/msp430_common/cpu.c similarity index 100% rename from cpu/msp430-common/cpu.c rename to cpu/msp430_common/cpu.c diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430_common/include/cpu.h similarity index 100% rename from cpu/msp430-common/include/cpu.h rename to cpu/msp430_common/include/cpu.h diff --git a/cpu/msp430-common/include/cpu_conf.h b/cpu/msp430_common/include/cpu_conf.h similarity index 100% rename from cpu/msp430-common/include/cpu_conf.h rename to cpu/msp430_common/include/cpu_conf.h diff --git a/cpu/msp430-common/include/msp430_types.h b/cpu/msp430_common/include/msp430_types.h similarity index 100% rename from cpu/msp430-common/include/msp430_types.h rename to cpu/msp430_common/include/msp430_types.h diff --git a/cpu/msp430-common/include/stdio.h b/cpu/msp430_common/include/stdio.h similarity index 100% rename from cpu/msp430-common/include/stdio.h rename to cpu/msp430_common/include/stdio.h diff --git a/cpu/msp430-common/include/stdlib.h b/cpu/msp430_common/include/stdlib.h similarity index 100% rename from cpu/msp430-common/include/stdlib.h rename to cpu/msp430_common/include/stdlib.h diff --git a/cpu/msp430-common/include/sys/time.h b/cpu/msp430_common/include/sys/time.h similarity index 100% rename from cpu/msp430-common/include/sys/time.h rename to cpu/msp430_common/include/sys/time.h diff --git a/cpu/msp430-common/include/sys/types.h b/cpu/msp430_common/include/sys/types.h similarity index 100% rename from cpu/msp430-common/include/sys/types.h rename to cpu/msp430_common/include/sys/types.h diff --git a/cpu/msp430-common/include/time.h b/cpu/msp430_common/include/time.h similarity index 100% rename from cpu/msp430-common/include/time.h rename to cpu/msp430_common/include/time.h diff --git a/cpu/msp430-common/include/unistd.h b/cpu/msp430_common/include/unistd.h similarity index 100% rename from cpu/msp430-common/include/unistd.h rename to cpu/msp430_common/include/unistd.h diff --git a/cpu/msp430-common/irq.c b/cpu/msp430_common/irq.c similarity index 100% rename from cpu/msp430-common/irq.c rename to cpu/msp430_common/irq.c diff --git a/cpu/msp430-common/msp430-main.c b/cpu/msp430_common/msp430-main.c similarity index 100% rename from cpu/msp430-common/msp430-main.c rename to cpu/msp430_common/msp430-main.c diff --git a/cpu/msp430-common/startup.c b/cpu/msp430_common/startup.c similarity index 100% rename from cpu/msp430-common/startup.c rename to cpu/msp430_common/startup.c diff --git a/cpu/msp430fxyz/Makefile b/cpu/msp430fxyz/Makefile index 703b33ac92..5fe0beeda7 100644 --- a/cpu/msp430fxyz/Makefile +++ b/cpu/msp430fxyz/Makefile @@ -2,6 +2,6 @@ MODULE =cpu include $(RIOTCPU)/$(CPU)/Makefile.include -DIRS = $(RIOTCPU)/msp430-common periph +DIRS = $(RIOTCPU)/msp430_common periph include $(RIOTBASE)/Makefile.base diff --git a/cpu/msp430fxyz/Makefile.include b/cpu/msp430fxyz/Makefile.include index b393e72c87..ab2d20164a 100644 --- a/cpu/msp430fxyz/Makefile.include +++ b/cpu/msp430fxyz/Makefile.include @@ -1,3 +1,3 @@ -include $(RIOTCPU)/msp430-common/Makefile.include +include $(RIOTCPU)/msp430_common/Makefile.include export USEMODULE += periph periph_common uart_stdio