Skip to content

[RFC] CMake: pass firmware file micro version to rimage #5759

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

Closed
mengdonglin wants to merge 2 commits into from
+5 −5
Closed

[RFC] CMake: pass firmware file micro version to rimage #5759

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
5ad032f
sof-ctl: Fix -Wformat,-Wsometimes-uninitialized
afq984 Apr 28, 2022
b5b3e32
CMake: pass firmware file micro version to rimage
mengdonglin Apr 29, 2022
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
4 changes: 2 additions & 2 deletions src/arch/xtensa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ if(MEU_PATH OR DEFINED MEU_NO_SIGN) # Don't sign with rimage
-s ${MEU_OFFSET}
-k ${RIMAGE_PRIVATE_KEY}
-i ${RIMAGE_IMR_TYPE}
-f ${SOF_MAJOR}.${SOF_MINOR}
-f ${SOF_MAJOR}.${SOF_MINOR}.${SOF_MICRO}
-b ${SOF_BUILD}
-e
${bootloader_binary_path}
Expand Down Expand Up @@ -498,7 +498,7 @@ else() # sign with rimage
-c "${PROJECT_SOURCE_DIR}/rimage/config/${fw_name}.toml"
-k ${RIMAGE_PRIVATE_KEY}
-i ${RIMAGE_IMR_TYPE}
-f ${SOF_MAJOR}.${SOF_MINOR}
-f ${SOF_MAJOR}.${SOF_MINOR}.${SOF_MICRO}
-b ${SOF_BUILD}
-e
${bootloader_binary_path}
Expand Down
6 changes: 3 additions & 3 deletions tools/ctl/ctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ static void hex_data_dump(struct ctl_data *ctl_data)
/* Print out in 16bit hex format */
for (i = 0; i < n; i++) {
if (!(i % 8))
fprintf(stdout, "%08lx ",
fprintf(stdout, "%08zx ",
i * sizeof(uint16_t));
fprintf(stdout, "%04x ", config[i]);
if ((i % 8) == 7)
Expand Down Expand Up @@ -410,7 +410,7 @@ static void ctl_dump(struct ctl_data *ctl_data)
{
FILE *fh;
int offset = 0;
size_t n;/* in bytes */
size_t n = 0;/* in bytes */

if (ctl_data->out_fd > 0) {
if (ctl_data->binary) {
Expand Down Expand Up @@ -441,7 +441,7 @@ static void ctl_dump(struct ctl_data *ctl_data)
csv_data_dump(ctl_data, fh);
}

fprintf(stdout, "%ld bytes written to file.\n", n);
fprintf(stdout, "%zd bytes written to file.\n", n);
fclose(fh);
} else {
/* dump to stdout */
Expand Down