Skip to content

Add BLOCK_DEVICE_PARTITION_ID define in bootrom_constants.h #3015

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

Merged
kilograham merged 2 commits into from
Jun 24, 2026
Merged

Add BLOCK_DEVICE_PARTITION_ID define in bootrom_constants.h #3015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3270fa2
Add BLOCK_DEVICE_PARTITION_ID define in bootrom_constants.h
will-v-pi Jun 17, 2026
2161b3d
BLOCK_DEVICE_PARTITION_ID -> BLOCK_DEVICE_DEFAULT_PARTITION_ID
will-v-pi Jun 18, 2026
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: 6 additions & 0 deletions src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@
#define BOOT_TBYB_AND_UPDATE_FLAG_OTP_VERSION_APPLIED 0x2
#define BOOT_TBYB_AND_UPDATE_FLAG_OTHER_ERASED 0x4

// PICO_CONFIG: BLOCK_DEVICE_DEFAULT_PARTITION_ID, default ID of block device partition which must match the ID used in the partition table JSON, type=int, default=0x626C6F636B646576, group=pico_bootrom

@lurch lurch Jun 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I have to confess that I've not fully grokked this, but if this is now a "default", should the "must match" be changed to "should match"?

#ifndef BLOCK_DEVICE_DEFAULT_PARTITION_ID
// The default 0x626C6F636B646576 value is the ASCII encoding of "blockdev"
#define BLOCK_DEVICE_DEFAULT_PARTITION_ID 0x626C6F636B646576
#endif

#ifndef __ASSEMBLER__
// Limited to 3 arguments in case of varm multiplex hint (trashes Arm r3)
typedef int (*bootrom_api_callback_generic_t)(uint32_t r0, uint32_t r1, uint32_t r2);
Expand Down
Loading