Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADSPs updates for HWMv2 #41

Merged
merged 3 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions app/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ tests:
tags: sof
build_only: true
platform_allow:
- intel_adsp_cavs25
- intel_adsp_ace15_mtpm
- intel_adsp_ace20_lnl
- nxp_adsp_imx8
- nxp_adsp_imx8x
- nxp_adsp_imx8m
- nxp_adsp_imx8ulp
- intel_adsp/cavs25
- intel_adsp/ace15_mtpm
- intel_adsp/ace20_lnl
- imx8qm_mek/mimx8qm6/adsp
- imx8qxp_mek/mimx8qx6/adsp
- imx8mp_evk/mimx8ml8/adsp
- imx8ulp_evk/imx8ulp/adsp

integration_platforms:
- intel_adsp_cavs25 # TGL
- intel_adsp_ace15_mtpm # MTL
- intel_adsp_ace20_lnl
- nxp_adsp_imx8
- nxp_adsp_imx8x
- nxp_adsp_imx8m
- nxp_adsp_imx8ulp
- intel_adsp/cavs25 # TGL
- intel_adsp/ace15_mtpm # MTL
- intel_adsp/ace20_lnl
- imx8qm_mek/mimx8qm6/adsp
- imx8qxp_mek/mimx8qx6/adsp
- imx8mp_evk/mimx8ml8/adsp
- imx8ulp_evk/imx8ulp/adsp
16 changes: 8 additions & 8 deletions scripts/xtensa-build-zephyr.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,56 +90,56 @@ class PlatformConfig:
platform_configs_all = {
# Intel platforms
"tgl" : PlatformConfig(
"intel", "intel_adsp_cavs25",
"intel", "intel_adsp/cavs25",
f"RG-2017.8{xtensa_tools_version_postfix}",
"cavs2x_LX6HiFi3_2017_8",
"xcc",
aliases = ['adl', 'adl-n', 'ehl', 'rpl'],
ipc4 = True
),
"tgl-h" : PlatformConfig(
"intel", "intel_adsp_cavs25_tgph",
"intel", "intel_adsp/cavs25/tgph",
f"RG-2017.8{xtensa_tools_version_postfix}",
"cavs2x_LX6HiFi3_2017_8",
"xcc",
aliases = ['adl-s', 'rpl-s'],
ipc4 = True
),
"mtl" : PlatformConfig(
"intel", "intel_adsp_ace15_mtpm",
"intel", "intel_adsp/ace15_mtpm",
f"RI-2022.10{xtensa_tools_version_postfix}",
"ace10_LX7HiFi4_2022_10",
aliases = ['arl', 'arl-s'],
ipc4 = True
),
"lnl" : PlatformConfig(
"intel", "intel_adsp_ace20_lnl",
"intel", "intel_adsp/ace20_lnl",
f"RI-2022.10{xtensa_tools_version_postfix}",
"ace10_LX7HiFi4_2022_10",
ipc4 = True
),

# NXP platforms
"imx8" : PlatformConfig(
"imx", "nxp_adsp_imx8",
"imx", "imx8qm_mek/mimx8qm6/adsp",
f"RI-2023.11{xtensa_tools_version_postfix}",
"hifi4_nxp_v5_3_1_prod",
RIMAGE_KEY = "key param ignored by imx8",
),
"imx8x" : PlatformConfig(
"imx", "nxp_adsp_imx8x",
"imx", "imx8qxp_mek/mimx8qx6/adsp",
f"RI-2023.11{xtensa_tools_version_postfix}",
"hifi4_nxp_v5_3_1_prod",
RIMAGE_KEY = "key param ignored by imx8x"
),
"imx8m" : PlatformConfig(
"imx", "nxp_adsp_imx8m",
"imx", "imx8mp_evk/mimx8ml8/adsp",
f"RI-2023.11{xtensa_tools_version_postfix}",
"hifi4_mscale_v2_0_2_prod",
RIMAGE_KEY = "key param ignored by imx8m"
),
"imx8ulp" : PlatformConfig(
"imx", "nxp_adsp_imx8ulp",
"imx", "imx8ulp_evk/imx8ulp/adsp",
f"RI-2023.11{xtensa_tools_version_postfix}",
"hifi4_nxp2_s7_v2_1a_prod",
RIMAGE_KEY = "key param ignored by imx8ulp"
Expand Down
6 changes: 3 additions & 3 deletions src/audio/base_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <sof/lib/cpu.h>
#include <rtos/init.h>
#include <platform/lib/clk.h>
#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
#include <intel_adsp_hda.h>
#endif

Expand All @@ -24,7 +24,7 @@
#include <zephyr/logging/log_ctrl.h>

/* TODO: Remove platform-specific code, see https://github.com/thesofproject/sof/issues/7549 */
#if defined(CONFIG_SOC_SERIES_INTEL_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
# define INTEL_ADSP 1
#endif

Expand Down Expand Up @@ -421,7 +421,7 @@ static int basefw_power_state_info_get(uint32_t *data_offset, char *data)

static int fw_config_set_force_l1_exit(const struct sof_tlv *tlv)
{
#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
const uint32_t force = tlv->value[0];

if (force) {
Expand Down
2 changes: 1 addition & 1 deletion src/ipc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ zephyr_library_sources(
dma-copy.c
)

if (CONFIG_SOC_SERIES_INTEL_CAVS_V25 OR CONFIG_SOC_SERIES_INTEL_ACE)
if (CONFIG_SOC_SERIES_INTEL_CAVS_V25 OR CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
zephyr_library_sources(
ipc-zephyr.c
)
Expand Down
2 changes: 1 addition & 1 deletion src/ipc/ipc4/helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <rtos/wait.h>

/* TODO: Remove platform-specific code, see https://github.com/thesofproject/sof/issues/7549 */
#if defined(CONFIG_SOC_SERIES_INTEL_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
#define RIMAGE_MANIFEST 1
#endif

Expand Down
8 changes: 4 additions & 4 deletions zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25)
endif()

# Intel ACE 1.5 and newer platforms
if (CONFIG_SOC_SERIES_INTEL_ACE)
if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)

# Platform sources
zephyr_library_sources(
Expand Down Expand Up @@ -232,7 +232,7 @@ if (CONFIG_SOC_SERIES_INTEL_ACE)
endif()

# NXP IMX8 platforms
if (CONFIG_SOC_SERIES_NXP_IMX8)
if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP)
zephyr_library_sources(
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
${SOF_DRIVERS_PATH}/imx/edma.c
Expand Down Expand Up @@ -261,7 +261,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8)
set(PLATFORM "imx8")
endif()

if (CONFIG_SOC_SERIES_NXP_IMX8M)
if (CONFIG_SOC_MIMX8MP_ADSP)
zephyr_library_sources(
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
${SOF_DRIVERS_PATH}/imx/sdma.c
Expand Down Expand Up @@ -290,7 +290,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8M)
set(PLATFORM "imx8m")
endif()

if (CONFIG_SOC_SERIES_NXP_IMX8ULP)
if (CONFIG_SOC_MIMX8ULP_ADSP)
zephyr_library_sources(
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
${SOF_DRIVERS_PATH}/imx/edma.c
Expand Down