Skip to content

[nrf noup] zephyr: Add support for ARM thumb filter #331

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

Merged
merged 2 commits into from
Oct 7, 2024

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Sep 2, 2024

Adds support for ARM thumb filter usage for compressed firmware
updates

if (rc) {
BOOT_LOG_ERR("Decompression error: %d", rc);
rc = BOOT_EBADSTATUS;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The empty line looks odd; somehow I think that it should be above rc = as the rc = and goto finish serve as "return".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the lines


if (compression == NULL || compression->init == NULL || compression->deinit == NULL ||
compression->decompress_bytes_needed == NULL || compression->decompress == NULL) {
if (compression_lzma == NULL || compression_lzma->init == NULL ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This basically begs for "is object valid" kind of function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


if (compression == NULL || compression->init == NULL || compression->deinit == NULL ||
compression->decompress_bytes_needed == NULL || compression->decompress == NULL) {
if (compression_lzma == NULL || compression_lzma->init == NULL ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The is "is object valid" function could be used here too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@nordicjm nordicjm force-pushed the compressionprwiththumb branch from 945338a to 31b797c Compare September 27, 2024 06:56
@nordicjm nordicjm requested a review from de-nordic September 27, 2024 06:57
@nordicjm nordicjm force-pushed the compressionprwiththumb branch from 31b797c to 3249524 Compare October 7, 2024 09:38
Adds support for ARM thumb filter usage for compressed firmware
updates

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm force-pushed the compressionprwiththumb branch from 3249524 to 7e94666 Compare October 7, 2024 10:01
Adds ARM thumb filter to imgtool's LZMA2 compression.

Upstream PR: mcu-tools/mcuboot#2084

Signed-off-by: Mateusz Michalek <[email protected]>
@nordicjm nordicjm merged commit 94212b4 into nrfconnect:main Oct 7, 2024
1 check passed
@nordicjm nordicjm deleted the compressionprwiththumb branch November 6, 2024 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants