diff --git a/boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk b/boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk index dbf611081a..77d81829dc 100644 --- a/boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk +++ b/boards/nxp/imx8ulp_evk/Kconfig.imx8ulp_evk @@ -4,4 +4,5 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_IMX8ULP_EVK - select SOC_MIMX8ULP_ADSP if BOARD_IMX8ULP_EVK_IMX8ULP_ADSP + select SOC_MIMX8UD7_ADSP if BOARD_IMX8ULP_EVK_MIMX8UD7_ADSP + select SOC_PART_NUMBER_MIMX8UD7DVK08 diff --git a/boards/nxp/imx8ulp_evk/board.cmake b/boards/nxp/imx8ulp_evk/board.cmake index 97e0a80ba0..572983699e 100644 --- a/boards/nxp/imx8ulp_evk/board.cmake +++ b/boards/nxp/imx8ulp_evk/board.cmake @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if(CONFIG_SOC_MIMX8ULP_ADSP) +if(CONFIG_SOC_MIMX8UD7_ADSP) board_set_flasher_ifnset(misc-flasher) board_finalize_runner_args(misc-flasher) diff --git a/boards/nxp/imx8ulp_evk/board.yml b/boards/nxp/imx8ulp_evk/board.yml index b401615d7d..bd5e16dc93 100644 --- a/boards/nxp/imx8ulp_evk/board.yml +++ b/boards/nxp/imx8ulp_evk/board.yml @@ -2,4 +2,4 @@ board: name: imx8ulp_evk vendor: nxp socs: - - name: imx8ulp + - name: mimx8ud7 diff --git a/boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts b/boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp.dts similarity index 100% rename from boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.dts rename to boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp.dts diff --git a/boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml b/boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp.yaml similarity index 75% rename from boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml rename to boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp.yaml index 437d112ee5..037b2ef909 100644 --- a/boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp.yaml +++ b/boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp.yaml @@ -1,4 +1,4 @@ -identifier: imx8ulp_evk/imx8ulp/adsp +identifier: imx8ulp_evk/mimx8ud7/adsp name: NXP i.MX 8ULP Audio DSP type: mcu arch: xtensa diff --git a/boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig b/boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp_defconfig similarity index 100% rename from boards/nxp/imx8ulp_evk/imx8ulp_evk_imx8ulp_adsp_defconfig rename to boards/nxp/imx8ulp_evk/imx8ulp_evk_mimx8ud7_adsp_defconfig diff --git a/soc/nxp/imx/imx8ulp/CMakeLists.txt b/soc/nxp/imx/imx8ulp/CMakeLists.txt index 55a7321827..ec3ef98ebe 100644 --- a/soc/nxp/imx/imx8ulp/CMakeLists.txt +++ b/soc/nxp/imx/imx8ulp/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright 2024 NXP # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_SOC_MIMX8ULP_ADSP) +if(CONFIG_SOC_MIMX8UD7_ADSP) zephyr_include_directories(adsp) add_subdirectory(adsp) diff --git a/soc/nxp/imx/imx8ulp/Kconfig b/soc/nxp/imx/imx8ulp/Kconfig index d0f92357c2..66da731ca9 100644 --- a/soc/nxp/imx/imx8ulp/Kconfig +++ b/soc/nxp/imx/imx8ulp/Kconfig @@ -1,7 +1,7 @@ # Copyright 2024 NXP # SPDX-License-Identifier: Apache-2.0 -config SOC_MIMX8ULP_ADSP +config SOC_MIMX8UD7_ADSP select XTENSA select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang") select XTENSA_RESET_VECTOR @@ -10,3 +10,10 @@ config SOC_MIMX8ULP_ADSP select GEN_ISR_TABLES select XTENSA_SMALL_VECTOR_TABLE_ENTRY select CPU_HAS_DCACHE + select HAS_MCUX + +# note: the NXP HAL refers to the HIFI4 DSP as +# `dsp1` and the Fusion DSP as `dsp0`, thus the +# suffix(es) below +config MCUX_CORE_SUFFIX + default "_dsp1" if SOC_MIMX8UD7_ADSP diff --git a/soc/nxp/imx/imx8ulp/Kconfig.defconfig b/soc/nxp/imx/imx8ulp/Kconfig.defconfig index f29f1c7d56..55a8e61ea6 100644 --- a/soc/nxp/imx/imx8ulp/Kconfig.defconfig +++ b/soc/nxp/imx/imx8ulp/Kconfig.defconfig @@ -3,7 +3,7 @@ if SOC_SERIES_IMX8ULP -if SOC_MIMX8ULP_ADSP +if SOC_MIMX8UD7_ADSP config SYS_CLOCK_HW_CYCLES_PER_SEC default 475200000 @@ -40,6 +40,6 @@ config TEST_LOGGING_DEFAULTS default n depends on TEST -endif # SOC_MIMX8ULP_ADSP +endif # SOC_MIMX8UD7_ADSP endif # SOC_SERIES_IMX8ULP diff --git a/soc/nxp/imx/imx8ulp/Kconfig.soc b/soc/nxp/imx/imx8ulp/Kconfig.soc index b7d4cadef7..49f0bc6dfd 100644 --- a/soc/nxp/imx/imx8ulp/Kconfig.soc +++ b/soc/nxp/imx/imx8ulp/Kconfig.soc @@ -8,19 +8,25 @@ config SOC_SERIES_IMX8ULP config SOC_SERIES default "imx8ulp" if SOC_SERIES_IMX8ULP -config SOC_MIMX8ULP +config SOC_MIMX8UD7 bool select SOC_SERIES_IMX8ULP config SOC - default "imx8ulp" if SOC_MIMX8ULP + default "mimx8ud7" if SOC_MIMX8UD7 -config SOC_MIMX8ULP_ADSP +config SOC_MIMX8UD7_ADSP bool - select SOC_MIMX8ULP + select SOC_MIMX8UD7 help Enable support for NXP i.MX 8ULP Audio DSP config SOC_TOOLCHAIN_NAME string - default "nxp_imx8ulp_adsp" if SOC_MIMX8ULP_ADSP + default "nxp_imx8ulp_adsp" if SOC_MIMX8UD7_ADSP + +config SOC_PART_NUMBER_MIMX8UD7DVK08 + bool + +config SOC_PART_NUMBER + default "MIMX8UD7DVK08" if SOC_PART_NUMBER_MIMX8UD7DVK08 diff --git a/soc/nxp/imx/soc.yml b/soc/nxp/imx/soc.yml index c1a4c16b37..307b7d8c5d 100644 --- a/soc/nxp/imx/soc.yml +++ b/soc/nxp/imx/soc.yml @@ -18,7 +18,7 @@ family: - name: m4 - name: imx8ulp socs: - - name: imx8ulp + - name: mimx8ud7 cpuclusters: - name: adsp - name: f1_dsp diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml index 39faa5f388..79015e632f 100644 --- a/submanifests/optional.yaml +++ b/submanifests/optional.yaml @@ -34,7 +34,7 @@ manifest: groups: - optional - name: sof - revision: 3e70d036a2df94b854add51742681b64ea0df729 + revision: 1c1dd3d83d85c3bd2bfd16f6d5bb101e764cb698 path: modules/audio/sof remote: upstream groups: