aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPeter Johanson <[email protected]>2023-11-15 04:22:09 +0000
committerPete Johanson <[email protected]>2024-02-09 14:32:46 -0800
commit802881b625664123a99db75e21e7c9dbe2b75c2c (patch)
tree04dcdb0643a6aecd62b2d1bac9a87f66a8086668
parentf4e6d704652e0cfc46bd0018deb6cddeb8c1b9ca (diff)
downloadzmk-802881b625664123a99db75e21e7c9dbe2b75c2c.tar.gz
zmk-802881b625664123a99db75e21e7c9dbe2b75c2c.zip
fix(boards): Remove references to PINMUX Kconfig.
-rw-r--r--app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig3
-rw-r--r--app/boards/arm/ferris/ferris_rev02_defconfig2
-rw-r--r--app/boards/arm/mikoto/CMakeLists.txt5
-rw-r--r--app/boards/arm/mikoto/Kconfig.defconfig3
-rw-r--r--app/boards/arm/nrfmicro/CMakeLists.txt5
-rw-r--r--app/boards/arm/nrfmicro/Kconfig.defconfig3
-rw-r--r--app/boards/arm/planck/planck_rev6_defconfig3
-rw-r--r--app/boards/arm/puchi_ble/CMakeLists.txt5
-rw-r--r--app/boards/arm/puchi_ble/Kconfig.defconfig3
9 files changed, 4 insertions, 28 deletions
diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig b/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
index 53bc0e1103..6b6c8a48de 100644
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
@@ -5,9 +5,6 @@ CONFIG_SOC_STM32F303XC=y
# 72MHz system clock
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
-# enable pinmux
-CONFIG_PINMUX=y
-
# enable GPIO
CONFIG_GPIO=y
diff --git a/app/boards/arm/ferris/ferris_rev02_defconfig b/app/boards/arm/ferris/ferris_rev02_defconfig
index 267035c9fb..bd03c3050d 100644
--- a/app/boards/arm/ferris/ferris_rev02_defconfig
+++ b/app/boards/arm/ferris/ferris_rev02_defconfig
@@ -6,7 +6,7 @@ CONFIG_SOC_STM32F072XB=y
# 48MHz system clock
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
-# enable PINMUX
+# enable PINCTRL
CONFIG_PINCTRL=y
# enable GPIO
diff --git a/app/boards/arm/mikoto/CMakeLists.txt b/app/boards/arm/mikoto/CMakeLists.txt
index 12cf9b1cf1..05214a680e 100644
--- a/app/boards/arm/mikoto/CMakeLists.txt
+++ b/app/boards/arm/mikoto/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
zephyr_library()
zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif() \ No newline at end of file
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) \ No newline at end of file
diff --git a/app/boards/arm/mikoto/Kconfig.defconfig b/app/boards/arm/mikoto/Kconfig.defconfig
index 8117cc8732..5702c6de34 100644
--- a/app/boards/arm/mikoto/Kconfig.defconfig
+++ b/app/boards/arm/mikoto/Kconfig.defconfig
@@ -21,9 +21,6 @@ endif # USB
config BT_CTLR
default BT
-config PINMUX
- default y
-
choice BOARD_MIKOTO_CHARGER_CURRENT
default BOARD_MIKOTO_CHARGER_CURRENT_100MA
endchoice
diff --git a/app/boards/arm/nrfmicro/CMakeLists.txt b/app/boards/arm/nrfmicro/CMakeLists.txt
index 12cf9b1cf1..05214a680e 100644
--- a/app/boards/arm/nrfmicro/CMakeLists.txt
+++ b/app/boards/arm/nrfmicro/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
zephyr_library()
zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif() \ No newline at end of file
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) \ No newline at end of file
diff --git a/app/boards/arm/nrfmicro/Kconfig.defconfig b/app/boards/arm/nrfmicro/Kconfig.defconfig
index 659e9c5c17..38daacde3f 100644
--- a/app/boards/arm/nrfmicro/Kconfig.defconfig
+++ b/app/boards/arm/nrfmicro/Kconfig.defconfig
@@ -18,9 +18,6 @@ endif # USB_DEVICE_STACK
config BT_CTLR
default BT
-config PINMUX
- default y
-
if BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833
config BOARD_NRFMICRO_CHARGER
diff --git a/app/boards/arm/planck/planck_rev6_defconfig b/app/boards/arm/planck/planck_rev6_defconfig
index 74050f3d9c..ce08f41dff 100644
--- a/app/boards/arm/planck/planck_rev6_defconfig
+++ b/app/boards/arm/planck/planck_rev6_defconfig
@@ -5,9 +5,6 @@ CONFIG_SOC_STM32F303XC=y
# 72MHz system clock
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
-
-# enable pinmux
-CONFIG_PINMUX=y
CONFIG_PINCTRL=y
# enable GPIO
diff --git a/app/boards/arm/puchi_ble/CMakeLists.txt b/app/boards/arm/puchi_ble/CMakeLists.txt
index 12cf9b1cf1..05214a680e 100644
--- a/app/boards/arm/puchi_ble/CMakeLists.txt
+++ b/app/boards/arm/puchi_ble/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
zephyr_library()
zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif() \ No newline at end of file
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) \ No newline at end of file
diff --git a/app/boards/arm/puchi_ble/Kconfig.defconfig b/app/boards/arm/puchi_ble/Kconfig.defconfig
index 3533104b2a..0ba7eefd04 100644
--- a/app/boards/arm/puchi_ble/Kconfig.defconfig
+++ b/app/boards/arm/puchi_ble/Kconfig.defconfig
@@ -16,7 +16,4 @@ endif # USB_DEVICE_STACK
config BT_CTLR
default BT
-config PINMUX
- default y
-
endif # BOARD_PUCHI_BLE_v1