From 3270fa2c6196f710f04ebc09f853be16cf2bf5eb Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Wed, 17 Jun 2026 12:47:21 +0100 Subject: [PATCH 1/2] Add BLOCK_DEVICE_PARTITION_ID define in bootrom_constants.h --- .../boot_bootrom_headers/include/boot/bootrom_constants.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h b/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h index ab2fa88fe..c107182f6 100644 --- a/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h +++ b/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h @@ -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_PARTITION_ID, ID of block device partition which must match the ID used in the partition table JSON, type=int, default=0x626C6F636B646576, group=pico_bootrom +#ifndef BLOCK_DEVICE_PARTITION_ID +// The default 0x626C6F636B646576 value is the ASCII encoding of "blockdev" +#define BLOCK_DEVICE_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); From 2161b3d70df0ea7f4bcbccf243591bd6c62ca3d9 Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Thu, 18 Jun 2026 11:02:37 +0100 Subject: [PATCH 2/2] BLOCK_DEVICE_PARTITION_ID -> BLOCK_DEVICE_DEFAULT_PARTITION_ID --- .../boot_bootrom_headers/include/boot/bootrom_constants.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h b/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h index c107182f6..bf90f58c3 100644 --- a/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h +++ b/src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h @@ -133,10 +133,10 @@ #define BOOT_TBYB_AND_UPDATE_FLAG_OTP_VERSION_APPLIED 0x2 #define BOOT_TBYB_AND_UPDATE_FLAG_OTHER_ERASED 0x4 -// PICO_CONFIG: BLOCK_DEVICE_PARTITION_ID, ID of block device partition which must match the ID used in the partition table JSON, type=int, default=0x626C6F636B646576, group=pico_bootrom -#ifndef BLOCK_DEVICE_PARTITION_ID +// 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 +#ifndef BLOCK_DEVICE_DEFAULT_PARTITION_ID // The default 0x626C6F636B646576 value is the ASCII encoding of "blockdev" -#define BLOCK_DEVICE_PARTITION_ID 0x626C6F636B646576 +#define BLOCK_DEVICE_DEFAULT_PARTITION_ID 0x626C6F636B646576 #endif #ifndef __ASSEMBLER__