From 1bbb603ed41477b2d3db4d79de2329a933cd32f3 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Tue, 16 Apr 2024 12:51:55 +0300 Subject: [PATCH 1/3] manifest: update zephyr hash Update Zephyr hash to point to PR introducing inline source code-related configuration. This is for testing purposes. 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..acb07defbd2e 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 2ccf775396c225f4398db1014886397a91f6d42f + revision: pull/71535/head remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision From c77d4e3c77a1ea2937508344c0eec6266170a376 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Mon, 11 Mar 2024 13:22:32 +0200 Subject: [PATCH 2/3] 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 ede34b728f5c166770c7102d6c6c40f7c8884588 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Tue, 16 Apr 2024 11:40:11 +0300 Subject: [PATCH 3/3] .github/zephyr: disable disassembly file inline source code The generated disassembly file on Windows can differ from the Linux one because of the included inline source code. One of the reasons for this were the ".." include paths. Because such differences are somewhat hard to debug and very unintuitive, disable the inline source code. This is fine because the machine code and assembly instructions should be good enough to use in reproductibility tests across platforms. Details in issue 9034. Signed-off-by: Laurentiu Mihalcea --- .github/workflows/zephyr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 1101d08f0635..dca91eef5e16 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -195,6 +195,7 @@ jobs: --cmake-args=-DEXTRA_AFLAGS='-Werror -Wa,--fatal-warnings' --cmake-args=--warn-uninitialized --cmake-args=-DCONFIG_OUTPUT_DISASSEMBLY=y + --cmake-args=-DCONFIG_OUTPUT_DISASSEMBLE_WITH_SOURCE=n ${{ matrix.build_opts }} ${{ matrix.IPC_platforms }} - name: Upload build artifacts @@ -361,6 +362,7 @@ jobs: --cmake-args=-DEXTRA_AFLAGS='-Werror -Wa,--fatal-warnings' --cmake-args=--warn-uninitialized --cmake-args=-DCONFIG_OUTPUT_DISASSEMBLY=y + --cmake-args=-DCONFIG_OUTPUT_DISASSEMBLE_WITH_SOURCE=n ${{ matrix.build_opts }} ${{ matrix.platforms }} - name: Upload build artifacts