From 00965e3a406c0c5256178e4fb95ddcb331cd3f42 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Wed, 21 Aug 2019 14:35:31 +0200 Subject: [PATCH] makefiles: Refactored channel configuration The default channel configuration is managed within the Makefiles of many examples and tests. This commit moves the default channel logic to `makefiles/default-channel.ink.mk` to ease maintenance. All Makefiles that previously managed the default channel configuration themself have been updated to include that file. The default channel configuration of the cc110x has been added --- examples/default/Makefile | 8 +------- examples/gnrc_border_router/Makefile | 8 +------- examples/gnrc_minimal/Makefile | 8 +------- examples/gnrc_networking/Makefile | 8 +------- examples/gnrc_networking_mac/Makefile | 5 ++--- examples/gnrc_tftp/Makefile | 3 +++ examples/nanocoap_server/Makefile | 8 +------- makefiles/default-channel.inc.mk | 13 +++++++++++++ tests/gnrc_gomach/Makefile | 7 +++---- tests/gnrc_lwmac/Makefile | 7 +++---- tests/gnrc_udp/Makefile | 8 +------- tests/riotboot_flashwrite/Makefile | 13 +------------ 12 files changed, 31 insertions(+), 65 deletions(-) create mode 100644 makefiles/default-channel.inc.mk diff --git a/examples/default/Makefile b/examples/default/Makefile index 79e53da8eb..81b193abc7 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -71,10 +71,4 @@ endif include $(RIOTBASE)/Makefile.include # Set a custom channel if needed -ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) -else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -endif +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile index 3d0c46d952..5d06f9d30b 100644 --- a/examples/gnrc_border_router/Makefile +++ b/examples/gnrc_border_router/Makefile @@ -116,10 +116,4 @@ host-tools: $(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS) # Set a custom channel if needed -ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) -else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -endif +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/examples/gnrc_minimal/Makefile b/examples/gnrc_minimal/Makefile index 7d7a1cf805..09f4be37df 100644 --- a/examples/gnrc_minimal/Makefile +++ b/examples/gnrc_minimal/Makefile @@ -36,10 +36,4 @@ QUIET ?= 1 include $(RIOTBASE)/Makefile.include # Set a custom channel if needed -ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) -else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -endif +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/examples/gnrc_networking/Makefile b/examples/gnrc_networking/Makefile index 57ca39821a..b5f3daf0c5 100644 --- a/examples/gnrc_networking/Makefile +++ b/examples/gnrc_networking/Makefile @@ -65,10 +65,4 @@ QUIET ?= 1 include $(RIOTBASE)/Makefile.include # Set a custom channel if needed -ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) -else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -endif +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/examples/gnrc_networking_mac/Makefile b/examples/gnrc_networking_mac/Makefile index c3825deff9..6c7b94e2d4 100644 --- a/examples/gnrc_networking_mac/Makefile +++ b/examples/gnrc_networking_mac/Makefile @@ -60,6 +60,5 @@ QUIET ?= 1 include $(RIOTBASE)/Makefile.include -# Set a custom channel -DEFAULT_CHANNEL ?= 26 -CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) +# Set a custom channel if needed +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/examples/gnrc_tftp/Makefile b/examples/gnrc_tftp/Makefile index 5d5debf2bb..6ad929251c 100644 --- a/examples/gnrc_tftp/Makefile +++ b/examples/gnrc_tftp/Makefile @@ -49,3 +49,6 @@ DEVELHELP ?= 1 QUIET ?= 1 include $(RIOTBASE)/Makefile.include + +# Set a custom channel if needed +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/examples/nanocoap_server/Makefile b/examples/nanocoap_server/Makefile index 8b908cb32b..4d4391c1fc 100644 --- a/examples/nanocoap_server/Makefile +++ b/examples/nanocoap_server/Makefile @@ -61,10 +61,4 @@ QUIET ?= 1 include $(RIOTBASE)/Makefile.include # Set a custom channel if needed -ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) -else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -endif +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/makefiles/default-channel.inc.mk b/makefiles/default-channel.inc.mk new file mode 100644 index 0000000000..924ef7687f --- /dev/null +++ b/makefiles/default-channel.inc.mk @@ -0,0 +1,13 @@ +# Set a custom channel if needed +ifneq (,$(filter cc110x,$(USEMODULE))) # radio is cc110x sub-GHz + DEFAULT_CHANNEL ?= 0 + CFLAGS += -DCC110X_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) +else + ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz + DEFAULT_CHANNEL ?= 5 + CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) + else # radio is IEEE 802.15.4 2.4 GHz + DEFAULT_CHANNEL ?= 26 + CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) + endif +endif diff --git a/tests/gnrc_gomach/Makefile b/tests/gnrc_gomach/Makefile index 0d07a58b26..1cd8a5abeb 100644 --- a/tests/gnrc_gomach/Makefile +++ b/tests/gnrc_gomach/Makefile @@ -42,8 +42,7 @@ USEMODULE += gnrc_gomach # reduce the size of the packet buffer a bit CFLAGS += -DGNRC_PKTBUF_SIZE=1024 -# Set a custom channel if needed -DEFAULT_CHANNEL ?= 26 -CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) - include $(RIOTBASE)/Makefile.include + +# Set a custom channel if needed +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/tests/gnrc_lwmac/Makefile b/tests/gnrc_lwmac/Makefile index 4235f85638..051610e07b 100644 --- a/tests/gnrc_lwmac/Makefile +++ b/tests/gnrc_lwmac/Makefile @@ -34,8 +34,7 @@ USEMODULE += gnrc_lwmac # reduce the size of the packet buffer a bit CFLAGS += -DGNRC_PKTBUF_SIZE=512 -# Set a custom channel if needed -DEFAULT_CHANNEL ?= 26 -CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) - include $(RIOTBASE)/Makefile.include + +# Set a custom channel if needed +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/tests/gnrc_udp/Makefile b/tests/gnrc_udp/Makefile index b4d10df9b2..5ffad9ba69 100644 --- a/tests/gnrc_udp/Makefile +++ b/tests/gnrc_udp/Makefile @@ -31,10 +31,4 @@ USEMODULE += netstats_ipv6 include $(RIOTBASE)/Makefile.include # Set a custom channel if needed -ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) -else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -endif +include $(RIOTMAKE)/default-channel.inc.mk diff --git a/tests/riotboot_flashwrite/Makefile b/tests/riotboot_flashwrite/Makefile index 21dce606af..11488baa72 100644 --- a/tests/riotboot_flashwrite/Makefile +++ b/tests/riotboot_flashwrite/Makefile @@ -65,15 +65,4 @@ QUIET ?= 1 include $(RIOTBASE)/Makefile.include # Set a custom channel if needed -ifneq (,$(filter cc110x,$(USEMODULE))) # radio is cc110x sub-GHz - DEFAULT_CHANNEL ?= 0 - CFLAGS += -DCC110X_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) -else - ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - DEFAULT_CHANNEL ?= 5 - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) - else # radio is IEEE 802.15.4 2.4 GHz - DEFAULT_CHANNEL ?= 26 - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) - endif -endif +include $(RIOTMAKE)/default-channel.inc.mk