nxp: imx8ulp: change SOC name to MIMX8UD7
The SOC name `imx8ulp` has been just a placeholder until support for the SOC's ADSP (since this is the only core that's supported in Zephyr) could be added to the NXP HAL. Now that the support has been added, to make use of it, the SOC name `imx8ulp` has to be changed to `mimx8ud7`. As such, this commit does the following: 1) Introduces SOC part number configuration - needed by some HAL headers. 2) Replaces all occurrences of `imx8ulp` (as the SOC name) with `mimx8ud7`. 3) Enables `CONFIG_HAS_MCUX`. 4) Aligns all `CONFIG_SOC_` configurations with the new SOC name. 5) Updates SOF hash. This is needed to fix build issues caused by this name change. This is not done in a separate commit to preserve bisectability. Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
This commit is contained in:
parent
b8214b6739
commit
9517639390
|
@ -4,4 +4,5 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
config BOARD_IMX8ULP_EVK
|
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
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
if(CONFIG_SOC_MIMX8ULP_ADSP)
|
if(CONFIG_SOC_MIMX8UD7_ADSP)
|
||||||
board_set_flasher_ifnset(misc-flasher)
|
board_set_flasher_ifnset(misc-flasher)
|
||||||
board_finalize_runner_args(misc-flasher)
|
board_finalize_runner_args(misc-flasher)
|
||||||
|
|
||||||
|
|
|
@ -2,4 +2,4 @@ board:
|
||||||
name: imx8ulp_evk
|
name: imx8ulp_evk
|
||||||
vendor: nxp
|
vendor: nxp
|
||||||
socs:
|
socs:
|
||||||
- name: imx8ulp
|
- name: mimx8ud7
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
identifier: imx8ulp_evk/imx8ulp/adsp
|
identifier: imx8ulp_evk/mimx8ud7/adsp
|
||||||
name: NXP i.MX 8ULP Audio DSP
|
name: NXP i.MX 8ULP Audio DSP
|
||||||
type: mcu
|
type: mcu
|
||||||
arch: xtensa
|
arch: xtensa
|
|
@ -1,7 +1,7 @@
|
||||||
# Copyright 2024 NXP
|
# Copyright 2024 NXP
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
if(CONFIG_SOC_MIMX8ULP_ADSP)
|
if(CONFIG_SOC_MIMX8UD7_ADSP)
|
||||||
zephyr_include_directories(adsp)
|
zephyr_include_directories(adsp)
|
||||||
add_subdirectory(adsp)
|
add_subdirectory(adsp)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Copyright 2024 NXP
|
# Copyright 2024 NXP
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
config SOC_MIMX8ULP_ADSP
|
config SOC_MIMX8UD7_ADSP
|
||||||
select XTENSA
|
select XTENSA
|
||||||
select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
|
select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
|
||||||
select XTENSA_RESET_VECTOR
|
select XTENSA_RESET_VECTOR
|
||||||
|
@ -10,3 +10,10 @@ config SOC_MIMX8ULP_ADSP
|
||||||
select GEN_ISR_TABLES
|
select GEN_ISR_TABLES
|
||||||
select XTENSA_SMALL_VECTOR_TABLE_ENTRY
|
select XTENSA_SMALL_VECTOR_TABLE_ENTRY
|
||||||
select CPU_HAS_DCACHE
|
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
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
if SOC_SERIES_IMX8ULP
|
if SOC_SERIES_IMX8ULP
|
||||||
|
|
||||||
if SOC_MIMX8ULP_ADSP
|
if SOC_MIMX8UD7_ADSP
|
||||||
|
|
||||||
config SYS_CLOCK_HW_CYCLES_PER_SEC
|
config SYS_CLOCK_HW_CYCLES_PER_SEC
|
||||||
default 475200000
|
default 475200000
|
||||||
|
@ -40,6 +40,6 @@ config TEST_LOGGING_DEFAULTS
|
||||||
default n
|
default n
|
||||||
depends on TEST
|
depends on TEST
|
||||||
|
|
||||||
endif # SOC_MIMX8ULP_ADSP
|
endif # SOC_MIMX8UD7_ADSP
|
||||||
|
|
||||||
endif # SOC_SERIES_IMX8ULP
|
endif # SOC_SERIES_IMX8ULP
|
||||||
|
|
|
@ -8,19 +8,25 @@ config SOC_SERIES_IMX8ULP
|
||||||
config SOC_SERIES
|
config SOC_SERIES
|
||||||
default "imx8ulp" if SOC_SERIES_IMX8ULP
|
default "imx8ulp" if SOC_SERIES_IMX8ULP
|
||||||
|
|
||||||
config SOC_MIMX8ULP
|
config SOC_MIMX8UD7
|
||||||
bool
|
bool
|
||||||
select SOC_SERIES_IMX8ULP
|
select SOC_SERIES_IMX8ULP
|
||||||
|
|
||||||
config SOC
|
config SOC
|
||||||
default "imx8ulp" if SOC_MIMX8ULP
|
default "mimx8ud7" if SOC_MIMX8UD7
|
||||||
|
|
||||||
config SOC_MIMX8ULP_ADSP
|
config SOC_MIMX8UD7_ADSP
|
||||||
bool
|
bool
|
||||||
select SOC_MIMX8ULP
|
select SOC_MIMX8UD7
|
||||||
help
|
help
|
||||||
Enable support for NXP i.MX 8ULP Audio DSP
|
Enable support for NXP i.MX 8ULP Audio DSP
|
||||||
|
|
||||||
config SOC_TOOLCHAIN_NAME
|
config SOC_TOOLCHAIN_NAME
|
||||||
string
|
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
|
||||||
|
|
|
@ -18,7 +18,7 @@ family:
|
||||||
- name: m4
|
- name: m4
|
||||||
- name: imx8ulp
|
- name: imx8ulp
|
||||||
socs:
|
socs:
|
||||||
- name: imx8ulp
|
- name: mimx8ud7
|
||||||
cpuclusters:
|
cpuclusters:
|
||||||
- name: adsp
|
- name: adsp
|
||||||
- name: f1_dsp
|
- name: f1_dsp
|
||||||
|
|
|
@ -34,7 +34,7 @@ manifest:
|
||||||
groups:
|
groups:
|
||||||
- optional
|
- optional
|
||||||
- name: sof
|
- name: sof
|
||||||
revision: 3e70d036a2df94b854add51742681b64ea0df729
|
revision: 1c1dd3d83d85c3bd2bfd16f6d5bb101e764cb698
|
||||||
path: modules/audio/sof
|
path: modules/audio/sof
|
||||||
remote: upstream
|
remote: upstream
|
||||||
groups:
|
groups:
|
||||||
|
|
Loading…
Reference in a new issue