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.

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

Fix output name of qpg_executable OTA #17786

Merged
merged 1 commit into from
Apr 27, 2022
Merged
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions third_party/qpg_sdk/qpg_executable.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@

import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

import("${build_root}/toolchain/flashable_executable.gni")
import("${chip_root}/src/platform/device.gni")
import("${dir_pw_build}/python_action.gni")
import("qpg_sdk.gni")

# Run the generator script that takes a .HEX file and adds the OTA header to it.
Expand All @@ -41,7 +43,7 @@ template("gen_ota_header") {
"data_deps",
])

action(target_name) {
pw_python_action(target_name) {
outputs = [ ota_header_script_name ]

args = ota_header_options
Expand Down Expand Up @@ -94,8 +96,10 @@ template("qpg_executable") {

# If OTA requestor is enabled, generate OTA image from HEX
if (chip_enable_ota_requestor) {
ota_image_name = invoker.output_name + ".ota"

gen_ota_header("$executable_target_name.ota") {
ota_header_script_name = "${root_out_dir}/${executable_target_name}.ota"
ota_header_script_name = "${root_out_dir}/${ota_image_name}"
out_dir = rebase_path(root_out_dir, root_build_dir)
ota_header_generator = "${qpg_sdk_root}/Tools/ota/generate_ota_img.py"

Expand Down