From 5e195e6c4931b0251ff22cbd08d0066f510d53df Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Mon, 22 Apr 2024 18:14:43 +0300 Subject: [PATCH 1/2] west.yml: update Zephyr to fb7e9379e137 Pulls in the following patches relevant to SOF: 94d156c9c84c nxp: imx8ulp: enable serial interface bc63835ba240 dts: xtensa: intel_adsp_cavs25_tgph: correct SSP definition aecf19c3c1be dts: xtensa: intel_adsp_ace15: correct SSP definition 45205f865e18 dts: xtensa: intel_adsp_ace20: correct SSP definition 17081222e2e7 drivers: dai: intel: ssp: fix LOG_ERR level / false positive fb7e9379e137 cmake: add control over inline source code disassembly Signed-off-by: Laurentiu Mihalcea --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index da914dbd854a..065770cc698f 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 3614d4cb88f4714c47af66d7053304092659fb43 + revision: fb7e9379e137a466b224a0ccd3a6c61020580f83 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision From d3bf47e9768f522f2e938818fd0453c396ee3538 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Mon, 22 Apr 2024 18:30:26 +0300 Subject: [PATCH 2/2] .github/zephyr: disable disassembly with inline source code By default, the disassembly file (.lst) generated during the build process when enabling `CONFIG_OUTPUT_DISASSEMBLY` will also contain inline source code. This is not ideal for reproducible builds that compare the .lst files obtained on different platforms (i.e: Windows and Linux) because of the differences in the inline source code that may appear. One of the identified causes for such differences were the ".." include paths, which resulted in the Windows .lst omitting some bits of the inline source code that were present in the Linux .lst file. Because these issues are hard to debug and unintuitive, the solution is to disable the inline source code. This way, the CI can keep testing for reproductibility using just the assembly and machine code from the .lst file, which are more important than the inline source code. This fixes thesofproject/sof/issues/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..73c20fcb5b67 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_DISASSEMBLY_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_DISASSEMBLY_WITH_SOURCE=n ${{ matrix.build_opts }} ${{ matrix.platforms }} - name: Upload build artifacts