From b77690061f4b290187fcce9a9d5c9054f429e9f2 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Mon, 11 Mar 2024 13:22:32 +0200 Subject: [PATCH 1/2] nxp: imx8/imx8x: switch to Zephyr logging Switch to using Zephyr logging on imx8 and imx8x to prepare for using native Zephyr drivers. Signed-off-by: Laurentiu Mihalcea --- app/boards/imx8qm_mek_mimx8qm6_adsp.conf | 2 ++ app/boards/imx8qm_mek_mimx8qm6_adsp.overlay | 19 ++++++++++--------- app/boards/imx8qxp_mek_mimx8qx6_adsp.conf | 2 ++ app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay | 13 ------------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/app/boards/imx8qm_mek_mimx8qm6_adsp.conf b/app/boards/imx8qm_mek_mimx8qm6_adsp.conf index a245738a5d80..13a56ed952be 100644 --- a/app/boards/imx8qm_mek_mimx8qm6_adsp.conf +++ b/app/boards/imx8qm_mek_mimx8qm6_adsp.conf @@ -2,3 +2,5 @@ CONFIG_IMX8=y CONFIG_HAVE_AGENT=n CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n +CONFIG_ZEPHYR_LOG=y +CONFIG_TRACE=n diff --git a/app/boards/imx8qm_mek_mimx8qm6_adsp.overlay b/app/boards/imx8qm_mek_mimx8qm6_adsp.overlay index c9b62545c2c8..d5af4896611b 100644 --- a/app/boards/imx8qm_mek_mimx8qm6_adsp.overlay +++ b/app/boards/imx8qm_mek_mimx8qm6_adsp.overlay @@ -4,15 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -/* TODO: this is a temporary workaround the fact that - * currently the Linux kernel doesn't enable MU2's power. - * As such, CCM (and all IPs that depend on Zephyr's - * clock management) are not usable. - */ &lpuart2 { - status = "disabled"; -}; - -&ccm { + /* note for developers: this is disabled + * because the firmware running on one of the M4 + * cores uses the same LPUART instance. As such, + * to debug you need to make sure that: + * 1) Your SOF DTS doesn't include the RPMSG + * DTS but instead the base DTS (which is + * "imx8qm-mek.dts") + * 2) Your u-boot doesn't include the M4 firmware + * images. + */ status = "disabled"; }; diff --git a/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf b/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf index a7766c19bb61..0584ccd9a255 100644 --- a/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf +++ b/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf @@ -2,3 +2,5 @@ CONFIG_IMX8X=y CONFIG_HAVE_AGENT=n CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n +CONFIG_ZEPHYR_LOG=y +CONFIG_TRACE=n diff --git a/app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay b/app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay index c9b62545c2c8..1df9eb948988 100644 --- a/app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay +++ b/app/boards/imx8qxp_mek_mimx8qx6_adsp.overlay @@ -3,16 +3,3 @@ * * SPDX-License-Identifier: Apache-2.0 */ - -/* TODO: this is a temporary workaround the fact that - * currently the Linux kernel doesn't enable MU2's power. - * As such, CCM (and all IPs that depend on Zephyr's - * clock management) are not usable. - */ -&lpuart2 { - status = "disabled"; -}; - -&ccm { - status = "disabled"; -}; From 22e6188cf65d84c2ca857f5632ae71792d87d299 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Mon, 15 Apr 2024 14:03:38 +0300 Subject: [PATCH 2/2] Test windows build change Signed-off-by: Laurentiu Mihalcea --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 60b62594ec0b..969c74e11444 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 2ccf775396c225f4398db1014886397a91f6d42f + revision: pull/71495/head remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision