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.

Sign up for GitHub

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

[SKIP SOF-TEST] Add new file: app/overlays/repro-build.conf #9264

Merged
merged 2 commits into from
Jul 2, 2024
+13 −6
Merged

[SKIP SOF-TEST] Add new file: app/overlays/repro-build.conf #9264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21b834
xtensa-build-zephyr.py: use EXTRA_CONF_FILE instead of OVERLAY_CONFIG
marc-hb Jun 26, 2024
abba5f5
Add new file: app/overlays/repro-build.conf
marc-hb Jun 26, 2024
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
6 changes: 2 additions & 4 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ jobs:
--cmake-args=-DEXTRA_CXXFLAGS=-Werror
--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
--overlay=sof/app/overlays/repro-build.conf
${{ matrix.build_opts }} ${{ matrix.IPC_platforms }}

- name: Upload build artifacts
Expand Down Expand Up @@ -361,8 +360,7 @@ jobs:
--cmake-args=-DEXTRA_CXXFLAGS=-Werror
--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
--overlay=sof/app/overlays/repro-build.conf
${{ matrix.build_opts }} ${{ matrix.platforms }}

- name: Upload build artifacts
Expand Down
2 changes: 2 additions & 0 deletions app/overlays/repro-build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_OUTPUT_DISASSEMBLY=y
CONFIG_OUTPUT_DISASSEMBLY_WITH_SOURCE=n
11 changes: 9 additions & 2 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,15 @@ def parse_args():
" to cmake (for rimage)")
parser.add_argument("-k", "--key", type=pathlib.Path, required=False,
help="Path to a non-default rimage signing key.")

# https://docs.zephyrproject.org/latest/build/kconfig/setting.html#initial-conf
# https://docs.zephyrproject.org/latest/develop/application/index.html#important-build-system-variables
parser.add_argument("-o", "--overlay", type=pathlib.Path, required=False, action='append',
default=[], help="Paths to overlays")
default=[], help=
"""All '-o arg1 -o arg2 ...' arguments are combined into a single -DEXTRA_CONF_FILE='arg1;arg2;...'
list. Files latter in the list seem to have precedence. Direct -C=-DCONFIG_xxx=.. options seem to
have precedence over -DEXTRA_CONF_FILE=... Rely on precedence as little as possible.""")

parser.add_argument("-p", "--pristine", required=False, action="store_true",
help="Perform pristine build removing build directory.")
parser.add_argument("-u", "--update", required=False, action="store_true",
Expand Down Expand Up @@ -832,7 +839,7 @@ def build_platforms():

if overlays:
overlays = ";".join(overlays)
build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")
build_cmd.append(f"-DEXTRA_CONF_FILE={overlays}")

abs_build_dir = pathlib.Path(west_top, platform_build_dir_name)

Expand Down
Loading