fix(boards): Remove references to PINMUX Kconfig.

petejohanson · Nov 15, 2023 · e4f100a · e4f100a
1 parent 5e1ba4f
commit e4f100a
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 28 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
 zephyr_library()
 zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif()
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
diff --git 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
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
 zephyr_library()
 zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif()
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
diff --git 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
@@ -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
@@ -1,6 +1,3 @@
-
-if(CONFIG_PINMUX)
 zephyr_library()
 zephyr_library_sources(pinmux.c)
-zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-endif()
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
diff --git 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