IPM: remove defconfig/proj setting of IPM drivers

galak · MaureenHelm · commit 117039ca2b72 · 2022-10-31T16:45:56.000-05:00
Now that IPM drivers are enabled based on devicetree we can
remove any cases of them getting enabled by Kconfig, *defconfig*,
and *.conf files.

We need to remove any cases of them getting enabled by
Kconfig.defconfig* files as this can lead to errors.

Signed-off-by: Kumar Gala &lt;kumar.gala@intel.com&gt;
diff --git a/boards/arm/bl5340_dvk/Kconfig b/boards/arm/bl5340_dvk/Kconfig
@@ -4,9 +4,6 @@
 # Copyright (c) 2021 Laird Connectivity
 # SPDX-License-Identifier: Apache-2.0
 
-config IPM_NRFX
-	default IPM
-
 config MBOX_NRFX_IPC
 	default MBOX
 
diff --git a/boards/arm/mps2_an521/Kconfig.defconfig b/boards/arm/mps2_an521/Kconfig.defconfig
@@ -29,11 +29,4 @@ config UART_INTERRUPT_DRIVEN
 
 endif # SERIAL
 
-if IPM
-
-config IPM_MHU
-	default y
-
-endif # IPM
-
 endif
diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig b/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig
@@ -76,9 +76,6 @@ endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 config BOARD
 	default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET
 
-config IPM_NRFX
-	default IPM
-
 config MBOX_NRFX_IPC
 	default MBOX
 
diff --git a/boards/arm/thingy53_nrf5340/Kconfig b/boards/arm/thingy53_nrf5340/Kconfig
@@ -9,9 +9,6 @@ config THINGY53_INIT_PRIORITY
 	help
 	  Initialization priority of the Thingy:53.
 
-config IPM_NRFX
-	default IPM
-
 config MBOX_NRFX_IPC
 	default MBOX
 
diff --git a/boards/arm/v2m_musca_b1/Kconfig.defconfig b/boards/arm/v2m_musca_b1/Kconfig.defconfig
@@ -14,11 +14,4 @@ config UART_INTERRUPT_DRIVEN
 
 endif # SERIAL
 
-if IPM
-
-config IPM_MHU
-	default y
-
-endif # IPM
-
 endif
diff --git a/boards/arm/v2m_musca_s1/Kconfig.defconfig b/boards/arm/v2m_musca_s1/Kconfig.defconfig
@@ -14,11 +14,4 @@ config UART_INTERRUPT_DRIVEN
 
 endif # SERIAL
 
-if IPM
-
-config IPM_MHU
-	default y
-
-endif # IPM
-
 endif
diff --git a/samples/boards/stm32/h7_dual_core/prj.conf b/samples/boards/stm32/h7_dual_core/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_GPIO=y
 
 CONFIG_IPM=y
-CONFIG_IPM_STM32_HSEM=y
diff --git a/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/prj.conf b/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_HEAP_MEM_POOL_SIZE=256
 CONFIG_IPM=y
-CONFIG_ESP32_SOFT_IPM=y
 CONFIG_KERNEL_BIN_NAME="esp32_net_firmware"
diff --git a/samples/drivers/ipm/ipm_esp32/prj.conf b/samples/drivers/ipm/ipm_esp32/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_ESP32_NETWORK_CORE=y
 CONFIG_IPM=y
-CONFIG_ESP32_SOFT_IPM=y
 CONFIG_LOG=y
diff --git a/samples/drivers/ipm/ipm_imx/prj.conf b/samples/drivers/ipm/ipm_imx/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_STDOUT_CONSOLE=n
 CONFIG_PRINTK=y
 CONFIG_IPM=y
-CONFIG_IPM_IMX=y
 CONFIG_IPM_IMX_MAX_DATA_SIZE_4=y
diff --git a/samples/drivers/ipm/ipm_mcux/prj.conf b/samples/drivers/ipm/ipm_mcux/prj.conf
@@ -1,6 +1,5 @@
 CONFIG_PRINTK=y
 CONFIG_IPM=y
-CONFIG_IPM_MCUX=y
 CONFIG_SECOND_CORE_MCUX=y
 CONFIG_SECOND_IMAGE_MCUX="${ZEPHYR_BINARY_DIR}/../ipm_mcux_remote-prefix/src/ipm_mcux_remote-build/zephyr/${KERNEL_BIN_NAME}"
 CONFIG_TIMESLICE_SIZE=1
diff --git a/samples/drivers/ipm/ipm_mcux/remote/prj.conf b/samples/drivers/ipm/ipm_mcux/remote/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_STDOUT_CONSOLE=n
 CONFIG_PRINTK=n
 CONFIG_IPM=y
-CONFIG_IPM_MCUX=y
 CONFIG_PLATFORM_SPECIFIC_INIT=n
diff --git a/samples/drivers/ipm/ipm_mhu_dual_core/prj.conf b/samples/drivers/ipm/ipm_mhu_dual_core/prj.conf
@@ -1,2 +1 @@
 CONFIG_IPM=y
-CONFIG_IPM_MHU=y
diff --git a/samples/subsys/ipc/openamp/boards/lpcxpresso54114_m4.conf b/samples/subsys/ipc/openamp/boards/lpcxpresso54114_m4.conf
@@ -1,3 +1,2 @@
-CONFIG_IPM_MCUX=y
 CONFIG_SECOND_CORE_MCUX=y
 CONFIG_SECOND_IMAGE_MCUX="${ZEPHYR_BINARY_DIR}/../openamp_remote-prefix/src/openamp_remote-build/zephyr/${KERNEL_BIN_NAME}"
diff --git a/samples/subsys/ipc/openamp/boards/lpcxpresso55s69_cpu0.conf b/samples/subsys/ipc/openamp/boards/lpcxpresso55s69_cpu0.conf
@@ -1,3 +1,2 @@
-CONFIG_IPM_MCUX=y
 CONFIG_SECOND_CORE_MCUX=y
 CONFIG_SECOND_IMAGE_MCUX="${ZEPHYR_BINARY_DIR}/../openamp_remote-prefix/src/openamp_remote-build/zephyr/zephyr.bin"
diff --git a/samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_m0.conf b/samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_m0.conf
diff --git a/samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_cpu1.conf b/samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_cpu1.conf
diff --git a/samples/subsys/ipc/rpmsg_service/remote/boards/lpcxpresso54114_m0.conf b/samples/subsys/ipc/rpmsg_service/remote/boards/lpcxpresso54114_m0.conf
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4 b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4
@@ -11,8 +11,4 @@ config SOC
 config FPU
 	default y
 
-config IPM_IMX
-	default y
-	depends on IPM
-
 endif # SOC_MCIMX6X_M4
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4 b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4
@@ -14,8 +14,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 config GPIO
 	default y
 
-config IPM_IMX
-	default y
-	depends on IPM
-
 endif # SOC_MCIMX7_M4
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series
@@ -10,8 +10,4 @@ source "soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.stm32mp15_m4"
 config SOC_SERIES
 	default "stm32mp1"
 
-config IPM_STM32_IPCC
-	default y
-	depends on IPM
-
 endif # SOC_SERIES_STM32MP1X

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`CONFIG_GPIO=y`
`2`	`2`
`3`	`3`	`CONFIG_IPM=y`
`4`		`-CONFIG_IPM_STM32_HSEM=y`