final touches

Author: tact1m4n3

core/src/cpus/cortex_m.zig

@@ -591,7 +591,7 @@ pub const startup_logic = struct {
     extern var microzig_bss_end: u8;
     extern const microzig_data_load_start: u8;
 
-    pub fn ram_image_entrypoint() linksection("microzig_ram_start") callconv(.naked) void {
+    pub fn ram_image_entry_point() linksection("microzig_ram_start") callconv(.naked) void {
         asm volatile (
             \\
             // Set VTOR to point to ram table
@@ -684,7 +684,7 @@ fn is_ramimage() bool {
 
 pub fn export_startup_logic() void {
     if (is_ramimage())
-        @export(&startup_logic.ram_image_entrypoint, .{
+        @export(&startup_logic.ram_image_entry_point, .{
             .name = "_entry_point",
             .linkage = .strong,
         })

port/raspberrypi/rp2xxx/src/hal.zig

@@ -49,12 +49,14 @@ comptime {
 pub const HAL_Options = switch (compatibility.chip) {
     .RP2040 => struct {},
     .RP2350 => 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_metadata_block: ?*const anyopaque = null,
+        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,
+        } = .{},
     },
 };
 

port/raspberrypi/rp2xxx/src/hal/bootmeta.zig

@@ -12,7 +12,7 @@ pub const image_def_block = if (microzig.config.ram_image and arch == .arm) Bloc
         .image_def = .{
             .image_type_flags = .{
                 .image_type = .exe,
-                .exe_security = root.microzig_options.hal.image_def_exe_security,
+                .exe_security = root.microzig_options.hal.bootmeta.image_def_exe_security,
                 .cpu = .arm,
                 .chip = .RP2350,
                 .try_before_you_buy = false,
@@ -21,26 +21,26 @@ pub const image_def_block = if (microzig.config.ram_image and arch == .arm) Bloc
         // We must specify a custom entry point since by default RP2350 expects
         // the vector table at the start of the image.
         .entry_point = .{
-            .entry = &microzig.cpu.startup_logic.ram_image_entrypoint,
-            .sp = microzig.config.end_of_stack,
+            .entry = &microzig.cpu.startup_logic.ram_image_entry_point,
+            .sp = microzig.cpu.startup_logic._vector_table.initial_stack_pointer,
         },
     },
-    .link = root.microzig_options.hal.next_metadata_block,
+    .link = root.microzig_options.hal.bootmeta.next_block,
 } else Block(extern struct {
     image_def: ImageDef,
 }){
     .items = .{
         .image_def = .{
             .image_type_flags = .{
                 .image_type = .exe,
-                .exe_security = root.microzig_options.hal.image_def_exe_security,
+                .exe_security = root.microzig_options.hal.bootmeta.image_def_exe_security,
                 .cpu = std.meta.stringToEnum(ImageDef.ImageTypeFlags.Cpu, @tagName(arch)).?,
                 .chip = .RP2350,
                 .try_before_you_buy = false,
             },
         },
     },
-    .link = root.microzig_options.hal.next_metadata_block,
+    .link = root.microzig_options.hal.bootmeta.next_block,
 };
 
 comptime {