boards/msba2-based: move shared code to common/msba2

2024-12-29 04:50:03 +01:00 · 2017-11-16 12:15:04 +01:00 · 2017-11-16 12:15:04 +01:00 · b7943900fc
commit b7943900fc
parent 4bcb353f89
52 changed files with 15 additions and 14 deletions
--- a/boards/avsextrem/Makefile
+++ b/boards/avsextrem/Makefile
@ -1,5 +1,5 @@
 MODULE = board

-DIRS = $(RIOTBOARD)/msba2-common
+DIRS = $(RIOTBOARD)/common/msba2

 include $(RIOTBASE)/Makefile.base
--- a/boards/avsextrem/Makefile.dep
+++ b/boards/avsextrem/Makefile.dep
@ -1 +1 @@
-include $(RIOTBOARD)/msba2-common/Makefile.dep
+include $(RIOTBOARD)/common/msba2/Makefile.dep
--- a/boards/avsextrem/Makefile.include
+++ b/boards/avsextrem/Makefile.include
@ -1,3 +1,3 @@
-USEMODULE += msba2-common
+USEMODULE += boards_common_msba2

-include $(RIOTBOARD)/msba2-common/Makefile.include
+include $(RIOTBOARD)/common/msba2/Makefile.include
--- a/boards/common/msba2/Makefile
+++ b/boards/common/msba2/Makefile
@ -1,4 +1,4 @@
-MODULE = msba2-common
+MODULE = boards_common_msba2

 DIRS = drivers

--- a/boards/common/msba2/Makefile.dep
+++ b/boards/common/msba2/Makefile.dep
--- a/boards/common/msba2/Makefile.include
+++ b/boards/common/msba2/Makefile.include
@ -26,10 +26,11 @@ ifeq ($(PORT),)
 endif
 export FFLAGS = $(PORT) $(HEXFILE)

-export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
+INCLUDES += -I$(RIOTBOARD)/common/msba2/include
+INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include

 export OFLAGS = -O ihex

 export UNDEF += $(BINDIR)/cpu/startup.o

-USEMODULE += msba2-common-drivers
+USEMODULE += boards_common_msba2-drivers
--- a/boards/common/msba2/board_common_init.c
+++ b/boards/common/msba2/board_common_init.c
--- a/boards/common/msba2/drivers/Makefile
+++ b/boards/common/msba2/drivers/Makefile
@ -0,0 +1,3 @@
+MODULE = boards_common_msba2-drivers
+
+include $(RIOTBASE)/Makefile.base
--- a/boards/common/msba2/drivers/include/sht11-board.h
+++ b/boards/common/msba2/drivers/include/sht11-board.h
--- a/boards/common/msba2/include/msba2_common.h
+++ b/boards/common/msba2/include/msba2_common.h
--- a/boards/common/msba2/tools/CHANGES
+++ b/boards/common/msba2/tools/CHANGES
--- a/boards/common/msba2/tools/COPYING
+++ b/boards/common/msba2/tools/COPYING
--- a/boards/common/msba2/tools/Makefile
+++ b/boards/common/msba2/tools/Makefile
--- a/boards/common/msba2/tools/README.txt
+++ b/boards/common/msba2/tools/README.txt
--- a/boards/common/msba2/tools/armtools.txt
+++ b/boards/common/msba2/tools/armtools.txt
--- a/boards/common/msba2/tools/flash.cmd
+++ b/boards/common/msba2/tools/flash.cmd
--- a/boards/common/msba2/tools/flashutil.sh
+++ b/boards/common/msba2/tools/flashutil.sh
--- a/boards/common/msba2/tools/mkbootc
+++ b/boards/common/msba2/tools/mkbootc
--- a/boards/common/msba2/tools/mkstaticlist
+++ b/boards/common/msba2/tools/mkstaticlist
--- a/boards/common/msba2/tools/obj/.gitignore
+++ b/boards/common/msba2/tools/obj/.gitignore
--- a/boards/common/msba2/tools/src/boot.h
+++ b/boards/common/msba2/tools/src/boot.h
--- a/boards/common/msba2/tools/src/boot_23xx.armasm
+++ b/boards/common/msba2/tools/src/boot_23xx.armasm
--- a/boards/common/msba2/tools/src/boot_23xx.c
+++ b/boards/common/msba2/tools/src/boot_23xx.c
--- a/boards/common/msba2/tools/src/boot_23xx.h
+++ b/boards/common/msba2/tools/src/boot_23xx.h
--- a/boards/common/msba2/tools/src/boot_2xxx.armasm
+++ b/boards/common/msba2/tools/src/boot_2xxx.armasm
--- a/boards/common/msba2/tools/src/boot_2xxx.c
+++ b/boards/common/msba2/tools/src/boot_2xxx.c
--- a/boards/common/msba2/tools/src/boot_2xxx.h
+++ b/boards/common/msba2/tools/src/boot_2xxx.h
--- a/boards/common/msba2/tools/src/chipinfo.c
+++ b/boards/common/msba2/tools/src/chipinfo.c
--- a/boards/common/msba2/tools/src/chipinfo.h
+++ b/boards/common/msba2/tools/src/chipinfo.h
--- a/boards/common/msba2/tools/src/cksum_test.c
+++ b/boards/common/msba2/tools/src/cksum_test.c
--- a/boards/common/msba2/tools/src/control_2xxx.c
+++ b/boards/common/msba2/tools/src/control_2xxx.c
--- a/boards/common/msba2/tools/src/control_2xxx.h
+++ b/boards/common/msba2/tools/src/control_2xxx.h
--- a/boards/common/msba2/tools/src/download.c
+++ b/boards/common/msba2/tools/src/download.c
--- a/boards/common/msba2/tools/src/download.h
+++ b/boards/common/msba2/tools/src/download.h
--- a/boards/common/msba2/tools/src/gui.c
+++ b/boards/common/msba2/tools/src/gui.c
--- a/boards/common/msba2/tools/src/gui.h
+++ b/boards/common/msba2/tools/src/gui.h
--- a/boards/common/msba2/tools/src/ihex.c
+++ b/boards/common/msba2/tools/src/ihex.c
--- a/boards/common/msba2/tools/src/ihex.h
+++ b/boards/common/msba2/tools/src/ihex.h
--- a/boards/common/msba2/tools/src/lpc2k_pgm.c
+++ b/boards/common/msba2/tools/src/lpc2k_pgm.c
--- a/boards/common/msba2/tools/src/lpc2k_pgm.h
+++ b/boards/common/msba2/tools/src/lpc2k_pgm.h
--- a/boards/common/msba2/tools/src/pseudoterm.c
+++ b/boards/common/msba2/tools/src/pseudoterm.c
--- a/boards/common/msba2/tools/src/serial.c
+++ b/boards/common/msba2/tools/src/serial.c
--- a/boards/common/msba2/tools/src/serial.h
+++ b/boards/common/msba2/tools/src/serial.h
--- a/boards/common/msba2/tools/src/settings.c
+++ b/boards/common/msba2/tools/src/settings.c
--- a/boards/common/msba2/tools/src/settings.h
+++ b/boards/common/msba2/tools/src/settings.h
--- a/boards/common/msba2/tools/src/uuencode.c
+++ b/boards/common/msba2/tools/src/uuencode.c
--- a/boards/common/msba2/tools/src/uuencode.h
+++ b/boards/common/msba2/tools/src/uuencode.h
--- a/boards/common/msba2/tools/termctrl.sh
+++ b/boards/common/msba2/tools/termctrl.sh
--- a/boards/msba2-common/drivers/Makefile
+++ b/boards/msba2-common/drivers/Makefile
@ -1,3 +0,0 @@
-MODULE = msba2-common-drivers
-
-include $(RIOTBASE)/Makefile.base
--- a/boards/msba2/Makefile
+++ b/boards/msba2/Makefile
@ -1,5 +1,5 @@
 MODULE = board

-DIRS = $(RIOTBOARD)/msba2-common
+DIRS = $(RIOTBOARD)/common/msba2

 include $(RIOTBASE)/Makefile.base
--- a/boards/msba2/Makefile.dep
+++ b/boards/msba2/Makefile.dep
@ -1 +1 @@
-include $(RIOTBOARD)/msba2-common/Makefile.dep
+include $(RIOTBOARD)/common/msba2/Makefile.dep
--- a/boards/msba2/Makefile.include
+++ b/boards/msba2/Makefile.include
@ -2,6 +2,6 @@ ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
  USEMODULE += cc110x
 endif

-USEMODULE += msba2-common
+USEMODULE += boards_common_msba2

-include $(RIOTBOARD)/msba2-common/Makefile.include
+include $(RIOTBOARD)/common/msba2/Makefile.include