From 0d607e4eb02b2e38531e89107b980fa6e8b42b57 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 14 Apr 2021 13:51:58 +0200 Subject: [PATCH 1/2] makefiles/stdio.inc.mk: stdio_uart require uart or lpuart --- makefiles/stdio.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/stdio.inc.mk b/makefiles/stdio.inc.mk index 2599138eaa..d5d10bce68 100644 --- a/makefiles/stdio.inc.mk +++ b/makefiles/stdio.inc.mk @@ -41,7 +41,7 @@ ifneq (,$(filter stdio_uart_rx,$(USEMODULE))) endif ifneq (,$(filter stdio_uart,$(USEMODULE))) - FEATURES_REQUIRED += periph_uart + FEATURES_REQUIRED_ANY += periph_uart|periph_lpuart endif ifneq (,$(filter stdio_semihosting,$(USEMODULE))) From 2049ab35d365daaf8bcbc6869261f556f14232b9 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 14 Apr 2021 13:52:15 +0200 Subject: [PATCH 2/2] boards: require lpuart only if stdio_uart is used --- boards/i-nucleo-lrwan1/Makefile.dep | 5 +++-- boards/nucleo-g431rb/Makefile.dep | 5 +++-- boards/nucleo-g474re/Makefile.dep | 5 +++-- boards/nucleo-l433rc/Makefile.dep | 5 +++-- boards/nucleo-l496zg/Makefile.dep | 5 +++-- boards/nucleo-l4r5zi/Makefile.dep | 5 +++-- boards/nucleo-l552ze-q/Makefile.dep | 5 +++-- boards/nucleo-wl55jc/Makefile.dep | 5 +++-- boards/p-nucleo-wb55/Makefile.dep | 5 +++-- 9 files changed, 27 insertions(+), 18 deletions(-) diff --git a/boards/i-nucleo-lrwan1/Makefile.dep b/boards/i-nucleo-lrwan1/Makefile.dep index c098354d39..5d45d9f981 100644 --- a/boards/i-nucleo-lrwan1/Makefile.dep +++ b/boards/i-nucleo-lrwan1/Makefile.dep @@ -1,5 +1,6 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif ifneq (,$(filter netdev_default,$(USEMODULE))) USEMODULE += sx1272 endif diff --git a/boards/nucleo-g431rb/Makefile.dep b/boards/nucleo-g431rb/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-g431rb/Makefile.dep +++ b/boards/nucleo-g431rb/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo-g474re/Makefile.dep b/boards/nucleo-g474re/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-g474re/Makefile.dep +++ b/boards/nucleo-g474re/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo-l433rc/Makefile.dep b/boards/nucleo-l433rc/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-l433rc/Makefile.dep +++ b/boards/nucleo-l433rc/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo-l496zg/Makefile.dep b/boards/nucleo-l496zg/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-l496zg/Makefile.dep +++ b/boards/nucleo-l496zg/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo-l4r5zi/Makefile.dep b/boards/nucleo-l4r5zi/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-l4r5zi/Makefile.dep +++ b/boards/nucleo-l4r5zi/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo-l552ze-q/Makefile.dep b/boards/nucleo-l552ze-q/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-l552ze-q/Makefile.dep +++ b/boards/nucleo-l552ze-q/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/nucleo-wl55jc/Makefile.dep b/boards/nucleo-wl55jc/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/nucleo-wl55jc/Makefile.dep +++ b/boards/nucleo-wl55jc/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep diff --git a/boards/p-nucleo-wb55/Makefile.dep b/boards/p-nucleo-wb55/Makefile.dep index f41bf0f86b..2f80f9d9bb 100644 --- a/boards/p-nucleo-wb55/Makefile.dep +++ b/boards/p-nucleo-wb55/Makefile.dep @@ -1,3 +1,4 @@ -FEATURES_REQUIRED += periph_lpuart - +ifneq (,$(filter stdio_uart,$(USEMODULE))) + FEATURES_REQUIRED += periph_lpuart +endif include $(RIOTBOARD)/common/nucleo/Makefile.dep