nxp: imx8: change CONFIG_SOC_<name> to match the value

Change, for audio DSP and M7 cores, SOC_<name> to match the exact soc name. Update the board files accordingly. These configs are used in SOF and NXP_HAL, so change sha for these modules. (cherry picked from commit 1f55be8) Original-Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> GitOrigin-RevId: 1f55be8 Change-Id: I3be0ba8bb85db311b225335fc4099fa287c65d2d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5412492 Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Commit-Queue: Tristan Honscheid <honscheid@google.com> Tested-by: Tristan Honscheid <honscheid@google.com> Reviewed-by: Tristan Honscheid <honscheid@google.com>
coreboot · Apr 2, 2024 · cbf0a54 · cbf0a54
1 parent e2f837d
commit cbf0a54
Show file tree

Hide file tree

Showing 24 changed files with 61 additions and 61 deletions.
diff --git a/boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk b/boards/nxp/imx8mp_evk/Kconfig.imx8mp_evk
@@ -3,6 +3,6 @@
 
 config BOARD_IMX8MP_EVK
 	select SOC_MIMX8ML8_A53 if BOARD_IMX8MP_EVK_MIMX8ML8_A53 || BOARD_IMX8MP_EVK_MIMX8ML8_A53_SMP
-	select SOC_MIMX8MP_ADSP if BOARD_IMX8MP_EVK_MIMX8ML8_ADSP
-	select SOC_MIMX8MP_M7 if BOARD_IMX8MP_EVK_MIMX8ML8_M7 || BOARD_IMX8MP_EVK_MIMX8ML8_M7_DDR
+	select SOC_MIMX8ML8_ADSP if BOARD_IMX8MP_EVK_MIMX8ML8_ADSP
+	select SOC_MIMX8ML8_M7 if BOARD_IMX8MP_EVK_MIMX8ML8_M7 || BOARD_IMX8MP_EVK_MIMX8ML8_M7_DDR
 	select SOC_PART_NUMBER_MIMX8ML8DVNLZ
diff --git a/boards/nxp/imx8mp_evk/board.cmake b/boards/nxp/imx8mp_evk/board.cmake
@@ -4,14 +4,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(CONFIG_SOC_MIMX8MP_ADSP)
+if(CONFIG_SOC_MIMX8ML8_ADSP)
   board_set_flasher_ifnset(misc-flasher)
   board_finalize_runner_args(misc-flasher)
 
   board_set_rimage_target(imx8m)
 endif()
 
-if(CONFIG_SOC_MIMX8MP_M7)
+if(CONFIG_SOC_MIMX8ML8_M7)
   board_set_debugger_ifnset(jlink)
   board_set_flasher_ifnset(jlink)
 

diff --git a/boards/nxp/imx8qm_mek/Kconfig.imx8qm_mek b/boards/nxp/imx8qm_mek/Kconfig.imx8qm_mek
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_IMX8QM_MEK
-	select SOC_MIMX8QM_ADSP if BOARD_IMX8QM_MEK_MIMX8QM6_ADSP
+	select SOC_MIMX8QM6_ADSP if BOARD_IMX8QM_MEK_MIMX8QM6_ADSP
 	select SOC_PART_NUMBER_MIMX8QM6AVUFF
diff --git a/boards/nxp/imx8qm_mek/board.cmake b/boards/nxp/imx8qm_mek/board.cmake
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(CONFIG_SOC_MIMX8QM_ADSP)
+if(CONFIG_SOC_MIMX8QM6_ADSP)
   board_set_flasher_ifnset(misc-flasher)
   board_finalize_runner_args(misc-flasher)
 

diff --git a/boards/nxp/imx8qxp_mek/Kconfig.imx8qxp_mek b/boards/nxp/imx8qxp_mek/Kconfig.imx8qxp_mek
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_IMX8QXP_MEK
-	select SOC_MIMX8QXP_ADSP if BOARD_IMX8QXP_MEK_MIMX8QX6_ADSP
+	select SOC_MIMX8QX6_ADSP if BOARD_IMX8QXP_MEK_MIMX8QX6_ADSP
 	select SOC_PART_NUMBER_MIMX8QX6AVLFZ
diff --git a/boards/nxp/imx8qxp_mek/board.cmake b/boards/nxp/imx8qxp_mek/board.cmake
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(CONFIG_SOC_MIMX8QXP_ADSP)
+if(CONFIG_SOC_MIMX8QX6_ADSP)
   board_set_flasher_ifnset(misc-flasher)
   board_finalize_runner_args(misc-flasher)
 

diff --git a/boards/phytec/mimx8mp_phyboard_pollux/Kconfig.mimx8mp_phyboard_pollux b/boards/phytec/mimx8mp_phyboard_pollux/Kconfig.mimx8mp_phyboard_pollux
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MIMX8MP_PHYBOARD_POLLUX
-	select SOC_MIMX8MP_M7 if BOARD_MIMX8MP_PHYBOARD_POLLUX_MIMX8ML8_M7
+	select SOC_MIMX8ML8_M7 if BOARD_MIMX8MP_PHYBOARD_POLLUX_MIMX8ML8_M7
 	select SOC_PART_NUMBER_MIMX8ML8DVNLZ
diff --git a/boards/toradex/verdin_imx8mp/Kconfig.verdin_imx8mp b/boards/toradex/verdin_imx8mp/Kconfig.verdin_imx8mp
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_VERDIN_IMX8MP
-	select SOC_MIMX8MP_M7 if BOARD_VERDIN_IMX8MP_MIMX8ML8_M7 || BOARD_VERDIN_IMX8MP_MIMX8ML8_M7_DDR
+	select SOC_MIMX8ML8_M7 if BOARD_VERDIN_IMX8MP_MIMX8ML8_M7 || BOARD_VERDIN_IMX8MP_MIMX8ML8_M7_DDR
 	select SOC_PART_NUMBER_MIMX8ML8DVNLZ
diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -12,7 +12,7 @@
 #include <zephyr/dt-bindings/clock/imx_ccm.h>
 #include <fsl_clock.h>
 
-#if defined(CONFIG_SOC_MIMX8QM_ADSP) || defined(CONFIG_SOC_MIMX8QXP_ADSP)
+#if defined(CONFIG_SOC_MIMX8QM6_ADSP) || defined(CONFIG_SOC_MIMX8QX6_ADSP)
 #include <main/ipc.h>
 #endif
 
@@ -46,7 +46,7 @@ static const clock_ip_name_t uart_clocks[] = {
 
 #ifdef CONFIG_UART_MCUX_LPUART
 
-#ifdef CONFIG_SOC_MIMX8QM_ADSP
+#ifdef CONFIG_SOC_MIMX8QM6_ADSP
 static const clock_ip_name_t lpuart_clocks[] = {
 	kCLOCK_DMA_Lpuart0,
 	kCLOCK_DMA_Lpuart1,
@@ -56,9 +56,9 @@ static const clock_ip_name_t lpuart_clocks[] = {
 };
 
 static const uint32_t lpuart_rate = MHZ(80);
-#endif /* CONFIG_SOC_MIMX8QM_ADSP */
+#endif /* CONFIG_SOC_MIMX8QM6_ADSP */
 
-#ifdef CONFIG_SOC_MIMX8QXP_ADSP
+#ifdef CONFIG_SOC_MIMX8QX6_ADSP
 static const clock_ip_name_t lpuart_clocks[] = {
 	kCLOCK_DMA_Lpuart0,
 	kCLOCK_DMA_Lpuart1,
@@ -67,7 +67,7 @@ static const clock_ip_name_t lpuart_clocks[] = {
 };
 
 static const uint32_t lpuart_rate = MHZ(80);
-#endif /* CONFIG_SOC_MIMX8QXP_ADSP */
+#endif /* CONFIG_SOC_MIMX8QX6_ADSP */
 
 #endif /* CONFIG_UART_MCUX_LPUART */
 
@@ -88,7 +88,7 @@ static int mcux_ccm_on(const struct device *dev,
 		return 0;
 #endif
 
-#if defined(CONFIG_UART_MCUX_LPUART) && defined(CONFIG_SOC_MIMX8QM_ADSP)
+#if defined(CONFIG_UART_MCUX_LPUART) && defined(CONFIG_SOC_MIMX8QM6_ADSP)
 	case IMX_CCM_LPUART1_CLK:
 	case IMX_CCM_LPUART2_CLK:
 	case IMX_CCM_LPUART3_CLK:
@@ -98,7 +98,7 @@ static int mcux_ccm_on(const struct device *dev,
 		return 0;
 #endif
 
-#if defined(CONFIG_UART_MCUX_LPUART) && defined(CONFIG_SOC_MIMX8QXP_ADSP)
+#if defined(CONFIG_UART_MCUX_LPUART) && defined(CONFIG_SOC_MIMX8QX6_ADSP)
 	case IMX_CCM_LPUART1_CLK:
 	case IMX_CCM_LPUART2_CLK:
 	case IMX_CCM_LPUART3_CLK:
@@ -174,7 +174,7 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 
 #ifdef CONFIG_UART_MCUX_LPUART
 
-#if defined(CONFIG_SOC_MIMX8QM_ADSP)
+#if defined(CONFIG_SOC_MIMX8QM6_ADSP)
 	case IMX_CCM_LPUART1_CLK:
 	case IMX_CCM_LPUART2_CLK:
 	case IMX_CCM_LPUART3_CLK:
@@ -186,7 +186,7 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev,
 		*rate = CLOCK_GetIpFreq(lpuart_clocks[instance]);
 		break;
 
-#elif defined(CONFIG_SOC_MIMX8QXP_ADSP)
+#elif defined(CONFIG_SOC_MIMX8QX6_ADSP)
 	case IMX_CCM_LPUART1_CLK:
 	case IMX_CCM_LPUART2_CLK:
 	case IMX_CCM_LPUART3_CLK:
@@ -428,7 +428,7 @@ static const struct clock_control_driver_api mcux_ccm_driver_api = {
 
 static int mcux_ccm_init(const struct device *dev)
 {
-#if defined(CONFIG_SOC_MIMX8QM_ADSP) || defined(CONFIG_SOC_MIMX8QXP_ADSP)
+#if defined(CONFIG_SOC_MIMX8QM6_ADSP) || defined(CONFIG_SOC_MIMX8QX6_ADSP)
 	sc_ipc_t ipc_handle;
 	int ret;
 

diff --git a/soc/nxp/imx/imx8/CMakeLists.txt b/soc/nxp/imx/imx8/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_MIMX8QM_ADSP)
+if(CONFIG_SOC_MIMX8QM6_ADSP)
   zephyr_include_directories(adsp)
   add_subdirectory(adsp)
 

diff --git a/soc/nxp/imx/imx8/Kconfig b/soc/nxp/imx/imx8/Kconfig
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_MIMX8QM_ADSP
+config SOC_MIMX8QM6_ADSP
 	select XTENSA
 	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
 	select XTENSA_RESET_VECTOR
@@ -13,4 +13,4 @@ config SOC_MIMX8QM_ADSP
 	select CPU_HAS_DCACHE
 
 config MCUX_CORE_SUFFIX
-	default "_dsp" if SOC_MIMX8QM_ADSP
+	default "_dsp" if SOC_MIMX8QM6_ADSP
diff --git a/soc/nxp/imx/imx8/Kconfig.defconfig b/soc/nxp/imx/imx8/Kconfig.defconfig
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_IMX8
 
-if SOC_MIMX8QM_ADSP
+if SOC_MIMX8QM6_ADSP
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 666000000
@@ -40,6 +40,6 @@ config TEST_LOGGING_DEFAULTS
 	default n
 	depends on TEST
 
-endif # SOC_MIMX8QM_ADSP
+endif # SOC_MIMX8QM6_ADSP
 
 endif # SOC_SERIES_IMX8
diff --git a/soc/nxp/imx/imx8/Kconfig.soc b/soc/nxp/imx/imx8/Kconfig.soc
@@ -8,22 +8,22 @@ config SOC_SERIES_IMX8
 config SOC_SERIES
 	default "imx8" if SOC_SERIES_IMX8
 
-config SOC_MIMX8QM
+config SOC_MIMX8QM6
 	bool
 	select SOC_SERIES_IMX8
 
 config SOC
-	default "mimx8qm6" if SOC_MIMX8QM
+	default "mimx8qm6" if SOC_MIMX8QM6
 
-config SOC_MIMX8QM_ADSP
+config SOC_MIMX8QM6_ADSP
 	bool
-	select SOC_MIMX8QM
+	select SOC_MIMX8QM6
 	help
 	  Enable support for NXP i.MX 8QM Audio DSP
 
 config SOC_TOOLCHAIN_NAME
 	string
-	default "nxp_imx_adsp" if SOC_MIMX8QM_ADSP
+	default "nxp_imx_adsp" if SOC_MIMX8QM6_ADSP
 
 config SOC_PART_NUMBER_MIMX8QM6AVUFF
 	bool

diff --git a/soc/nxp/imx/imx8m/CMakeLists.txt b/soc/nxp/imx/imx8m/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_MIMX8MP_ADSP)
+if(CONFIG_SOC_MIMX8ML8_ADSP)
   zephyr_include_directories(adsp)
   add_subdirectory(adsp)
 
@@ -48,6 +48,6 @@ if(CONFIG_SOC_MIMX8MQ6_M4)
   add_subdirectory(m4_quad)
 endif()
 
-if(CONFIG_SOC_MIMX8MP_M7)
+if(CONFIG_SOC_MIMX8ML8_M7)
   add_subdirectory(m7)
 endif()
diff --git a/soc/nxp/imx/imx8m/Kconfig b/soc/nxp/imx/imx8m/Kconfig
@@ -39,7 +39,7 @@ config SOC_MIMX8MN6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 
-config SOC_MIMX8MP_ADSP
+config SOC_MIMX8ML8_ADSP
 	select XTENSA
 	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
 	select XTENSA_RESET_VECTOR
@@ -53,7 +53,7 @@ config SOC_MIMX8MP_ADSP
 	select PINCTRL_IMX if HAS_MCUX_IOMUXC
 	select CPU_HAS_DCACHE
 
-config SOC_MIMX8MP_M7
+config SOC_MIMX8ML8_M7
 	select ARM
 	select CPU_CORTEX_M7
 	select CPU_HAS_FPU
@@ -81,9 +81,9 @@ config SOC_MIMX8MQ6_M4
 
 config MCUX_CORE_SUFFIX
 	default "_ca53" if SOC_MIMX8MM6_A53 || SOC_MIMX8MN6_A53 || SOC_MIMX8ML8_A53
-	default "_dsp" if SOC_MIMX8MP_ADSP
+	default "_dsp" if SOC_MIMX8ML8_ADSP
 
-if SOC_MIMX8MP_M7
+if SOC_MIMX8ML8_M7
 
 choice CODE_LOCATION
 	prompt "Code location selection"
@@ -99,4 +99,4 @@ endchoice
 config INIT_VIDEO_PLL
 	bool "Initialize Video PLL"
 
-endif # SOC_MIMX8MP_M7
+endif # SOC_MIMX8ML8_M7
diff --git a/soc/nxp/imx/imx8m/Kconfig.defconfig.mimx8ml8.m7 b/soc/nxp/imx/imx8m/Kconfig.defconfig.mimx8ml8.m7
@@ -4,7 +4,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_MIMX8MP_M7
+if SOC_MIMX8ML8_M7
 
 config SOC
 	string
@@ -50,4 +50,4 @@ config PINCTRL_IMX
 	default y if HAS_MCUX_IOMUXC
 	depends on PINCTRL
 
-endif # SOC_MIMX8MP_M7
+endif # SOC_MIMX8ML8_M7
diff --git a/soc/nxp/imx/imx8m/Kconfig.defconfig.mimx8ml8_adsp b/soc/nxp/imx/imx8m/Kconfig.defconfig.mimx8ml8_adsp
@@ -3,7 +3,7 @@
 
 if SOC_SERIES_IMX8M
 
-if SOC_MIMX8MP_ADSP
+if SOC_MIMX8ML8_ADSP
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 800000000
@@ -43,6 +43,6 @@ config TEST_LOGGING_DEFAULTS
 	default n
 	depends on TEST
 
-endif # SOC_MIMX8MP_ADSP
+endif # SOC_MIMX8ML8_ADSP
 
 endif # SOC_SERIES_IMX8M
diff --git a/soc/nxp/imx/imx8m/Kconfig.soc b/soc/nxp/imx/imx8m/Kconfig.soc
@@ -24,25 +24,25 @@ config SOC_MIMX8MM6_M4
 	help
 	  NXP i.MX8MM M4
 
-config SOC_MIMX8MP
+config SOC_MIMX8ML8
 	bool
 	select SOC_SERIES_IMX8M
 
 config SOC_MIMX8ML8_A53
 	bool
-	select SOC_MIMX8MP
+	select SOC_MIMX8ML8
 	help
 	  NXP i.MX8MP A53
 
-config SOC_MIMX8MP_ADSP
+config SOC_MIMX8ML8_ADSP
 	bool
-	select SOC_MIMX8MP
+	select SOC_MIMX8ML8
 	help
 	  Enable support for NXP i.MX 8MPLUS Audio DSP
 
-config SOC_MIMX8MP_M7
+config SOC_MIMX8ML8_M7
 	bool
-	select SOC_MIMX8MP
+	select SOC_MIMX8ML8
 	help
 	  Enable support for NXP i.MX 8MPLUS M7 MCU
 
@@ -58,7 +58,7 @@ config SOC_MIMX8MQ6_M4
 
 config SOC_TOOLCHAIN_NAME
 	string
-	default "nxp_imx8m_adsp" if SOC_MIMX8MP_ADSP
+	default "nxp_imx8m_adsp" if SOC_MIMX8ML8_ADSP
 
 config SOC_MIMX8MN6
 	bool
@@ -73,7 +73,7 @@ config SOC_MIMX8MN6_A53
 config SOC
 	default "mimx8mm6" if SOC_MIMX8MM6
 	default "mimx8mn6" if SOC_MIMX8MN6
-	default "mimx8ml8" if SOC_MIMX8MP
+	default "mimx8ml8" if SOC_MIMX8ML8
 	default "mimx8mq6" if SOC_MIMX8MQ6
 
 config SOC_PART_NUMBER_MIMX8ML8DVNLZ

diff --git a/soc/nxp/imx/imx8x/CMakeLists.txt b/soc/nxp/imx/imx8x/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_MIMX8QXP_ADSP)
+if(CONFIG_SOC_MIMX8QX6_ADSP)
   zephyr_include_directories(adsp)
   add_subdirectory(adsp)
 

diff --git a/soc/nxp/imx/imx8x/Kconfig b/soc/nxp/imx/imx8x/Kconfig
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_MIMX8QXP_ADSP
+config SOC_MIMX8QX6_ADSP
 	select XTENSA
 	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
 	select XTENSA_RESET_VECTOR
@@ -13,4 +13,4 @@ config SOC_MIMX8QXP_ADSP
 	select CPU_HAS_DCACHE
 
 config MCUX_CORE_SUFFIX
-	default "_dsp" if SOC_MIMX8QXP_ADSP
+	default "_dsp" if SOC_MIMX8QX6_ADSP