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

makefiles: add OPENOCD_DEBUG_ADAPTER and SLOT_AUX_LEN to riotboot build environment #20752

Merged
merged 1 commit into from
Jun 14, 2024

Conversation

fabian18
Copy link
Contributor

@fabian18 fabian18 commented Jun 14, 2024

Contribution description

When using the auxiliary flash slot, the image slot size shrinks.
This must be known to the firmware image AND the bootloader.
Else slot 1 will not be booted after a SUIT update.
This PR adds the SLOT_AUX_LEN variable to the build environment of the bootloader

Testing procedure

Without this fix, check the riotbuild.h in the bin folder of an application with SLOT_AUX_LEN = 0x10000 and in bootloaders/riotboot/bin. You will see that for example SLOT0_LEN is different.

Issues/PRs references

@github-actions github-actions bot added the Area: build system Area: Build system label Jun 14, 2024
@fabian18 fabian18 force-pushed the pr/fix_riotboot_build_with_slot_aux branch from a434183 to bb80878 Compare June 14, 2024 15:44
@fabian18 fabian18 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Jun 14, 2024
@riot-ci
Copy link

riot-ci commented Jun 14, 2024

Murdock results

✔️ PASSED

bb80878 makefiles: add OPENOCD_DEBUG_ADAPTER and SLOT_AUX_LEN to riotboot build env.

Success Failures Total Runtime
10178 0 10178 20m:14s

Artifacts

@maribu maribu enabled auto-merge June 14, 2024 16:31
@maribu maribu added this pull request to the merge queue Jun 14, 2024
Merged via the queue into RIOT-OS:master with commit a8a7987 Jun 14, 2024
28 checks passed
@fabian18
Copy link
Contributor Author

Thanks :)

@mguetschow mguetschow added this to the Release 2024.07 milestone Jul 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants