OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,677 Commits 191 Branches 212 Tags 54 MiB
C 65.6%
M4 11.1%
Assembly 6.5%
Python 5.4%
MATLAB 5.1%
Other 6.2%
Go to file
Marc Herbert 8aab18351f xtensa-build-zephyr: fix DEFAULT_TOOLCHAIN_VARIANT spill on next platf 
xtensa-build-zephyr.py has always defined XTENSA_ and other environment
variables in the current environment shared by all platforms. This was
always bad but apparently never a problem until the addition of the new
DEFAULT_TOOLCHAIN_VARIANT (xcc or clang) variable.

Before DEFAULT_TOOLCHAIN_VARIANT, each platform's environment would
simply override the previous one. However with the new
DEFAULT_TOOLCHAIN_VARIANT, the current environment has precedence for
more flexibility. This makes each platform "spill" onto the next one and
`xtensa-build-zephyr.py -p tgl mtl` fail like this:

```
-- Board: intel_adsp_ace15_mtpm
-- Found toolchain: xcc (/home/XCC/install/tools)
CMake Error at zephyr/cmake/compiler/xcc/generic.cmake:9 (message):
  Zephyr was unable to find the toolchain.  Is the environment
  misconfigured?

  User-configuration:

  ZEPHYR_TOOLCHAIN_VARIANT: xcc

  Internal variables:

  CROSS_COMPILE:
  /home/XCC/install/tools/RI-2022.10-linux/XtensaTools/bin/xt-
```

To fix this, stop modifying the current os.environ and use a new, fresh
os.environ.copy() for each platform instead.

Fixes commit 309fa264e2 ("xtensa-build-zephyr.py: upgraded Xtensa
toolchain for MTL")

History repeats itself: commit 6bedd8e742 ("xtensa-build-zephyr: fix
RIMAGE_KEY when building multiple platforms") fixed the same logical
error months ago in a different script.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
 		2023-03-13 14:19:49 +02:00
.github .github/sparse-zephyr: add missing workflow_call to fix daily tests 2023-03-06 12:06:09 +00:00
app mtl: add Aria module to build 2023-03-09 13:54:32 +00:00
doc header: rtos: decouple headers into rtos specific directories. 2022-08-31 12:01:07 +01:00
installer platform: remove support for cAVS 1.8 platforms 2023-03-02 23:02:37 +00:00
keys
…
rimage@d32db50b61 west.yml: upgrade rimage to d32db50 2023-03-08 14:12:06 +02:00
scripts xtensa-build-zephyr: fix DEFAULT_TOOLCHAIN_VARIANT spill on next platf 2023-03-13 14:19:49 +02:00
smex header: rtos: decouple headers into rtos specific directories. 2022-08-31 12:01:07 +01:00
src platform: cannonlake: remove unused file idc.h 2023-03-10 22:03:55 +00:00
submanifests Add west.yml configuring zephyr dependencies from sof 2022-08-03 11:43:22 +01:00
test Test: Cmocka: Convert mux to module adapter 2023-03-09 13:33:26 +02:00
third_party/include Updating of GoogleRtcAudioProcessing component to provide a more general behavior 2022-12-09 16:00:16 -08:00
tools Tools: Testbench: Change struct of struct zeros initialize 2023-03-13 10:00:48 +02:00
xtos/include clock: replace per-clock locks with a global one 2023-03-07 13:37:56 +02:00
zephyr Audio: Dcblock: Add HiFi4 implementation of dcblock 2023-03-10 11:37:45 +02:00
.gitignore .gitignore: stop ignoring CMake files for in-source doxygen builds 2022-07-19 09:38:30 +01:00
.gitmodules .gitmodules: remove .git suffix from rimage.git 2021-09-30 15:56:44 +01:00
.travis.yml .github: replace HAVE_CONFIG KConfig hack with an override 2021-03-23 12:17:22 +00:00
CMakeLists.txt platform: Add Zephyr native_posix-based emulation environment 2022-12-07 17:25:39 +00:00
CODEOWNERS CODEOWNERS: more intel code owners added 2023-02-24 16:08:39 +00:00
Kconfig kconfig: allow SOF Kconfig to be included in other projects 2021-08-04 12:34:39 +01:00
Kconfig.sof Performance: remove perf avg macro and reduce print profiling logs 2022-11-01 10:45:00 +00:00
Kconfig.xtos-build kconfig: move BUILD_VM_ROM Kconfig.xtos-build 2021-05-25 15:53:39 +01:00
Kconfig.xtos-dbg Kconfig: use uncached buffer only for debugging 2021-09-29 16:36:27 +01:00
Kconfig.zephyr-log sof: replace log calls with zephyr logging api 2022-04-27 15:05:24 +01:00
LICENCE LICENCE: Add Khronos Group Inc license header 2022-04-12 19:41:27 +03:00
README.md README.md: add link to discord.com/zephyr#sof channel 2022-12-23 11:13:31 +00:00
west.yml west.yml: upgrade rimage to d32db50 2023-03-08 14:12:06 +02:00

README.md

Sound Open Firmware

Status

Daily Actions

Gitter chat

#sof channel on discord.com

Documentation

See docs

Running the tests

See unit testing documentation

Deployment

TODO: Add additional notes about how to deploy this on a live system

Contributing

See Contributing to the Project

License

This project is licensed under the BSD Clause 3 - see the LICENCE file for details