Skip to content

rp2xxx fixes #959

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

Open
Grazfather wants to merge 2 commits into
base: main
Choose a base branch
from
+37 −19
Open

rp2xxx fixes #959

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
11ba4ec
rp2xxx: Fix type for bootmeta link
Grazfather Jun 13, 2026
54b806a
rp2xxx: Fix flash sizes
Grazfather Jun 13, 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
28 changes: 25 additions & 3 deletions port/raspberrypi/rp2xxx/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub fn init(dep: *std.Build.Dependency) Self {
.name = "RP2040",
.register_definition = .{ .svd = pico_sdk.path("src/rp2040/hardware_regs/RP2040.svd") },
.memory_regions = &.{
.{ .tag = .flash, .offset = 0x10000000, .length = 2048 * 1024, .access = .rx },
.{ .tag = .flash, .offset = 0x10000000, .length = 2 * 1024 * 1024, .access = .rx },
.{ .tag = .ram, .offset = 0x20000000, .length = 256 * 1024, .access = .rwx },
},
.patch_files = &.{b.path("patches/rp2040.zon")},
Expand All @@ -87,7 +87,7 @@ pub fn init(dep: *std.Build.Dependency) Self {
.name = "RP2350",
.register_definition = .{ .svd = pico_sdk.path("src/rp2350/hardware_regs/RP2350.svd") },
.memory_regions = &.{
.{ .tag = .flash, .offset = 0x10000000, .length = 2048 * 1024, .access = .rx },
.{ .tag = .flash, .offset = 0x10000000, .length = 4 * 1024 * 1024, .access = .rx },
.{ .tag = .ram, .offset = 0x20000000, .length = 512 * 1024, .access = .rwx },
// TODO: maybe these can be used for stacks
.{ .tag = .ram, .offset = 0x20080000, .length = 4 * 1024, .access = .rwx },
Expand Down Expand Up @@ -139,7 +139,7 @@ pub fn init(dep: *std.Build.Dependency) Self {
.name = "RP2350",
.register_definition = .{ .svd = pico_sdk.path("src/rp2350/hardware_regs/RP2350.svd") },
.memory_regions = &.{
.{ .tag = .flash, .offset = 0x10000000, .length = 2048 * 1024, .access = .rx },
.{ .tag = .flash, .offset = 0x10000000, .length = 4 * 1024 * 1024, .access = .rx },
.{ .tag = .ram, .offset = 0x20000000, .length = 512 * 1024, .access = .rwx },
// TODO: maybe these can be used for stacks
.{ .tag = .ram, .offset = 0x20080000, .length = 4 * 1024, .access = .rwx },
Expand Down Expand Up @@ -170,13 +170,35 @@ pub fn init(dep: *std.Build.Dependency) Self {
.boards = .{
.adafruit = .{
.feather_rp2350 = chip_rp2350_arm.derive(.{
.chip = .{
.name = "RP2350",
.register_definition = .{ .svd = pico_sdk.path("src/rp2350/hardware_regs/RP2350.svd") },
.memory_regions = &.{
.{ .tag = .flash, .offset = 0x10000000, .length = 8 * 1024 * 1024, .access = .rx },
.{ .tag = .ram, .offset = 0x20000000, .length = 512 * 1024, .access = .rwx },
.{ .tag = .ram, .offset = 0x20080000, .length = 4 * 1024, .access = .rwx },
.{ .tag = .ram, .offset = 0x20081000, .length = 4 * 1024, .access = .rwx },
},
.patch_files = &.{b.path("patches/rp2350.zon")},
},
.board = .{
.name = "Adafruit Feather RP2350",
.url = "https://www.adafruit.com/product/6000",
.root_source_file = b.path("src/boards/adafruit_feather_rp2350.zig"),
},
}),
.metro_rp2350 = chip_rp2350_arm.derive(.{
.chip = .{
.name = "RP2350",
.register_definition = .{ .svd = pico_sdk.path("src/rp2350/hardware_regs/RP2350.svd") },
.memory_regions = &.{
.{ .tag = .flash, .offset = 0x10000000, .length = 16 * 1024 * 1024, .access = .rx },
.{ .tag = .ram, .offset = 0x20000000, .length = 512 * 1024, .access = .rwx },
.{ .tag = .ram, .offset = 0x20080000, .length = 4 * 1024, .access = .rwx },
.{ .tag = .ram, .offset = 0x20081000, .length = 4 * 1024, .access = .rwx },
},
.patch_files = &.{b.path("patches/rp2350.zon")},
},
.board = .{
.name = "Adafruit Metro RP2350",
.url = "https://www.adafruit.com/product/6267",
Expand Down
5 changes: 0 additions & 5 deletions port/raspberrypi/rp2xxx/src/hal.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ pub const HAL_Options = switch (compatibility.chip) {
.RP2350 => struct {
bootmeta: struct {
image_def_exe_security: bootmeta.ImageDef.ImageTypeFlags.ExeSecurity = .secure,

/// Next metadata block to link after image_def. **Last block in
/// the chain must link back to the first one** (to
/// `bootmeta.image_def_block`).
next_block: ?*const anyopaque = null,
} = .{},

/// Enable the DCP and export intrinsics. Leads to faster double
Expand Down
23 changes: 12 additions & 11 deletions port/raspberrypi/rp2xxx/src/hal/bootmeta.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const std = @import("std");
const microzig = @import("microzig");
const arch = @import("compatibility.zig").arch;

pub const image_def_block = if (microzig.config.ram_image and arch == .arm) Block(extern struct {
pub const image_def_block = if (microzig.config.ram_image and arch == .arm) Block(packed struct {

@mattnite mattnite Jun 13, 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.

Please include the backing integer for the packed struct, that's required upstream

@Grazfather Grazfather Jun 15, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Do you mean that all packed structs will require the size? I'd rather not put it here, since it's derived from the size of its fields, and I set it there. If we were to change this, we'd have to manually add up the sizes of all of fields.

image_def: ImageDef,
entry_point: EntryPoint(false),
}){
Expand All @@ -24,8 +24,7 @@ pub const image_def_block = if (microzig.config.ram_image and arch == .arm) Bloc
.sp = microzig.utilities.get_end_of_stack(),
},
},
.link = microzig.options.hal.bootmeta.next_block,
} else Block(extern struct {
} else Block(packed struct {

@mattnite mattnite Jun 13, 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.

ditto

image_def: ImageDef,
}){
.items = .{
Expand All @@ -39,7 +38,6 @@ pub const image_def_block = if (microzig.config.ram_image and arch == .arm) Bloc
},
},
},
.link = microzig.options.hal.bootmeta.next_block,
};

comptime {
Expand All @@ -55,17 +53,20 @@ pub fn Block(Items: type) type {
header: u32 = 0xffffded3,
items: Items,
last_item: u32 = 0x000000ff | ((@sizeOf(Items) / 4) << 8),
link: ?*const anyopaque = null,
/// Relative offset from this block's header to the next block's
/// header. Zero means self-loop (single-block chain).
link: i32 = 0,
footer: u32 = 0xab123579,
};
}

pub const ImageDef = packed struct {
pub const ImageDef = packed struct(u32) {
// IMAGE_DEF type = 0x42
item_type: u8 = 0x42,
block_size: u8 = 0x01,
image_type_flags: ImageTypeFlags,

pub const ImageTypeFlags = packed struct {
pub const ImageTypeFlags = packed struct(u16) {
image_type: ImageType,
exe_security: ExeSecurity,
reserved0: u2 = 0,
Expand Down Expand Up @@ -100,8 +101,8 @@ pub const ImageDef = packed struct {

pub fn EntryPoint(with_stack_limit: bool) type {
if (with_stack_limit) {
return extern struct {
header: packed struct {
return packed struct(u128) {
header: packed struct(u32) {
Comment on lines +104 to +105

@tact1m4n3 tact1m4n3 Jun 14, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

What is the reason for replacing all externs with packed (just wondering)?

@Grazfather Grazfather Jun 15, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

as I understand, packed structs are 'now' the correct way to bit pack. And by using them, we can say how large they are and catch in the compile if the size changes. I accidentally changed the size of a field and it bit me :)

item_type: u8 = 0x44,
block_size: u8 = 0x04,
padding: u16 = 0,
Expand All @@ -111,8 +112,8 @@ pub fn EntryPoint(with_stack_limit: bool) type {
sp_limit: u32,
};
} else {
return extern struct {
header: packed struct {
return packed struct(u96) {
header: packed struct(u32) {
item_type: u8 = 0x44,
block_size: u8 = 0x03,
padding: u16 = 0,
Expand Down
Loading