From 13c89b5feb387c5904734573cbc564681477a17c Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 3 Jun 2019 13:06:01 +0200 Subject: [PATCH 1/2] boards/kw41z: move boards common kw41z to specific boards usb-kw41z and frdm-kw41z are affected by this change. --- boards/common/kw41z/Makefile.include | 1 - boards/frdm-kw41z/Makefile.include | 3 +++ boards/usb-kw41z/Makefile.include | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/boards/common/kw41z/Makefile.include b/boards/common/kw41z/Makefile.include index cc41cc464d..ca988700aa 100644 --- a/boards/common/kw41z/Makefile.include +++ b/boards/common/kw41z/Makefile.include @@ -4,7 +4,6 @@ export CPU_MODEL = mkw41z512vht4 # include this module into the build INCLUDES += -I$(RIOTBOARD)/common/kw41z/include -USEMODULE += boards_common_kw41z # This board comes with OpenSDA configured for JLink compatibility DEBUG_ADAPTER ?= jlink diff --git a/boards/frdm-kw41z/Makefile.include b/boards/frdm-kw41z/Makefile.include index 50f356ef7d..67c0562790 100644 --- a/boards/frdm-kw41z/Makefile.include +++ b/boards/frdm-kw41z/Makefile.include @@ -1 +1,4 @@ +# This board uses the shared board_init function +USEMODULE += boards_common_kw41z + include $(RIOTBOARD)/common/kw41z/Makefile.include diff --git a/boards/usb-kw41z/Makefile.include b/boards/usb-kw41z/Makefile.include index 50f356ef7d..67c0562790 100644 --- a/boards/usb-kw41z/Makefile.include +++ b/boards/usb-kw41z/Makefile.include @@ -1 +1,4 @@ +# This board uses the shared board_init function +USEMODULE += boards_common_kw41z + include $(RIOTBOARD)/common/kw41z/Makefile.include From af7331dd415d9cdb2537b5124ecb2d697ca3997f Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 3 Jun 2019 13:06:30 +0200 Subject: [PATCH 2/2] boards/phynode-kw41z: use common kw41z board configuration --- boards/phynode-kw41z/Makefile.include | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/boards/phynode-kw41z/Makefile.include b/boards/phynode-kw41z/Makefile.include index ca563730e0..52a9b1bb6e 100644 --- a/boards/phynode-kw41z/Makefile.include +++ b/boards/phynode-kw41z/Makefile.include @@ -1,20 +1,13 @@ -# define the cpu used by the board -export CPU = kinetis -export CPU_MODEL = mkw41z512vht4 - -# include this module into the build -INCLUDES += -I$(RIOTBOARD)/common/kw41z/include - # use openocd by default to program this board PROGRAMMER ?= openocd # dap debug adapter is required for openocd ifeq (openocd,$(PROGRAMMER)) -DEBUG_ADAPTER = dap + DEBUG_ADAPTER = dap endif # Enable direct write to FCF (required for setting FOPT byte). export OPENOCD_PRE_FLASH_CMDS += "-c kinetis fcf_source write" # Include default FRDM board config -include $(RIOTBOARD)/common/frdm/Makefile.include +include $(RIOTBOARD)/common/kw41z/Makefile.include