From c66712918e79c0af19c0f6027d6b31bef02aab59 Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Tue, 28 Sep 2021 10:41:44 +0200 Subject: [PATCH] Revert "drivers: pinmux: build as static library" This reverts commit 43309296b863b1ccea8de0cf7dcdad8eeb52afb1. Fixes: #38403 The referred commit introduced `zephyr_library()` for pinmux drivers but also resulting in #38403 because several boards has `CONFIG_PINMUX=y` without selecting any pinmux drivers from `drivers/pinmux` thus generating the following warning: > No SOURCES given to Zephyr library: drivers__pinmux > > Excluding target from build. This commit reverts the changes so that this warning disappears. This results in pinmux drivers from `drivers/pinmux` to be located in libzephyr.a which is messy, but has been so for a long time, even before Zephyr 1.14 LTS. The future pinctrl API will be designed in such a way that this problem will not occur. Thus the old behavior is acceptable until the transition to pinctrl API has completed. Signed-off-by: Torsten Rasmussen --- drivers/pinmux/CMakeLists.txt | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/pinmux/CMakeLists.txt b/drivers/pinmux/CMakeLists.txt index b8c7fd532bd8..7961fca8f429 100644 --- a/drivers/pinmux/CMakeLists.txt +++ b/drivers/pinmux/CMakeLists.txt @@ -1,19 +1,17 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_library() - # Board initialization -zephyr_library_sources_ifdef(CONFIG_PINMUX_CC13XX_CC26XX pinmux_cc13xx_cc26xx.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_ESP32 pinmux_esp32.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_HSDK pinmux_hsdk.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_INTEL_S1000 pinmux_intel_s1000.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_ITE_IT8XXX2 pinmux_ite_it8xxx2.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_LPC11U6X pinmux_lpc11u6x.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_MCUX pinmux_mcux.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_MCUX_LPC pinmux_mcux_lpc.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_RV32M1 pinmux_rv32m1.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_SAM0 pinmux_sam0.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_SIFIVE pinmux_sifive.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_STM32 pinmux_stm32.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_TELINK_B91 pinmux_b91.c) -zephyr_library_sources_ifdef(CONFIG_PINMUX_XEC pinmux_mchp_xec.c) +zephyr_sources_ifdef(CONFIG_PINMUX_TELINK_B91 pinmux_b91.c) +zephyr_sources_ifdef(CONFIG_PINMUX_CC13XX_CC26XX pinmux_cc13xx_cc26xx.c) +zephyr_sources_ifdef(CONFIG_PINMUX_ESP32 pinmux_esp32.c) +zephyr_sources_ifdef(CONFIG_PINMUX_HSDK pinmux_hsdk.c) +zephyr_sources_ifdef(CONFIG_PINMUX_INTEL_S1000 pinmux_intel_s1000.c) +zephyr_sources_ifdef(CONFIG_PINMUX_ITE_IT8XXX2 pinmux_ite_it8xxx2.c) +zephyr_sources_ifdef(CONFIG_PINMUX_LPC11U6X pinmux_lpc11u6x.c) +zephyr_sources_ifdef(CONFIG_PINMUX_MCUX pinmux_mcux.c) +zephyr_sources_ifdef(CONFIG_PINMUX_MCUX_LPC pinmux_mcux_lpc.c) +zephyr_sources_ifdef(CONFIG_PINMUX_RV32M1 pinmux_rv32m1.c) +zephyr_sources_ifdef(CONFIG_PINMUX_SAM0 pinmux_sam0.c) +zephyr_sources_ifdef(CONFIG_PINMUX_SIFIVE pinmux_sifive.c) +zephyr_sources_ifdef(CONFIG_PINMUX_STM32 pinmux_stm32.c) +zephyr_sources_ifdef(CONFIG_PINMUX_XEC pinmux_mchp_xec.c)