fixes and support for riscv

Author: tact1m4n3

port/raspberrypi/rp2xxx/build.zig

@@ -19,6 +19,7 @@ boards: struct {
         pico2_arm: *const microzig.Target,
         pico2_arm_flashless: *const microzig.Target,
         pico2_riscv: *const microzig.Target,
+        pico2_riscv_flashless: *const microzig.Target,
     },
     waveshare: struct {
         rp2040_plus_4m: *const microzig.Target,
@@ -210,17 +211,17 @@ pub fn init(dep: *std.Build.Dependency) Self {
                         .root_source_file = b.path("src/boards/raspberry_pi_pico2.zig"),
                     },
                 }),
-                // .pico2_riscv_flashless = chip_rp2350_riscv.derive(.{
-                //     .ram_image = true,
-                //     .linker_script = .{
-                //         .file = b.path("ld/rp2350/arm_ram_image_sections.ld"),
-                //     },
-                //     .board = .{
-                //         .name = "RaspberryPi Pico 2 (ram image)",
-                //         .url = "https://www.raspberrypi.com/products/raspberry-pi-pico2/",
-                //         .root_source_file = b.path("src/boards/raspberry_pi_pico2.zig"),
-                //     },
-                // }),
+                .pico2_riscv_flashless = chip_rp2350_riscv.derive(.{
+                    .ram_image = true,
+                    .linker_script = .{
+                        .file = b.path("ld/rp2350/riscv_ram_image_sections.ld"),
+                    },
+                    .board = .{
+                        .name = "RaspberryPi Pico 2 (ram image)",
+                        .url = "https://www.raspberrypi.com/products/raspberry-pi-pico2/",
+                        .root_source_file = b.path("src/boards/raspberry_pi_pico2.zig"),
+                    },
+                }),
             },
             .waveshare = .{
                 .rp2040_plus_4m = chip_rp2040.derive(.{

port/raspberrypi/rp2xxx/ld/rp2350/riscv_ram_image_sections.ld

@@ -0,0 +1,23 @@
+SECTIONS {
+  .bootmeta :
+  {
+    __bootmeta_start__ = .;
+    KEEP(*(.bootmeta))
+    __bootmeta_end__ = .;
+  } > ram0
+
+  .vectors :
+  {
+    KEEP(*(core_vectors))
+  } > ram0
+}
+INSERT AFTER .ram_start;
+
+SECTIONS {
+  .ram_vectors (NOLOAD) :
+  {
+    KEEP(*(ram_vectors))
+  } > ram0
+}
+INSERT AFTER .bss;
+

port/raspberrypi/rp2xxx/ld/rp2350/riscv_sections.ld

@@ -15,7 +15,7 @@ SECTIONS {
 INSERT AFTER .flash_start;
 
 SECTIONS {
-  .ram_vectors (NOLOAD)  :
+  .ram_vectors (NOLOAD) :
   {
     KEEP(*(ram_vectors))
   } > ram0

port/raspberrypi/rp2xxx/src/cpus/hazard3.zig

@@ -204,24 +204,24 @@ pub const startup_logic = struct {
     pub export fn _start_c() callconv(.c) noreturn {
         if (!microzig.config.ram_image) {
             root.initialize_system_memories();
+        }
 
-            // Move vector table to RAM if requested
-            if (interrupt.has_ram_vectors()) {
-                if (interrupt.has_ram_vectors_section()) {
-                    @export(&ram_vectors, .{
-                        .name = "_ram_vectors",
-                        .section = "ram_vectors",
-                        .linkage = .strong,
-                    });
-                } else {
-                    @export(&ram_vectors, .{
-                        .name = "_ram_vectors",
-                        .linkage = .strong,
-                    });
-                }
-
-                @memcpy(&ram_vectors, &startup_logic.external_interrupt_table);
+        // Move vector table to RAM if requested
+        if (interrupt.has_ram_vectors()) {
+            if (interrupt.has_ram_vectors_section()) {
+                @export(&ram_vectors, .{
+                    .name = "_ram_vectors",
+                    .section = "ram_vectors",
+                    .linkage = .strong,
+                });
+            } else {
+                @export(&ram_vectors, .{
+                    .name = "_ram_vectors",
+                    .linkage = .strong,
+                });
             }
+
+            @memcpy(&ram_vectors, &startup_logic.external_interrupt_table);
         }
 
         microzig_main();
@@ -321,7 +321,7 @@ pub fn export_startup_logic() void {
 
     @export(&startup_logic.external_interrupt_table, .{
         .name = "_external_interrupt_table",
-        .section = if (!microzig.config.ram_image) "flash_vectors" else ".data",
+        .section = if (!microzig.config.ram_image) "flash_vectors" else null,
         .linkage = .strong,
     });
 }

tools/generate_linker_script.zig

@@ -218,7 +218,7 @@ pub fn main() !void {
             \\    microzig_data_end = .;
             \\  }} > {s}
             \\
-            \\  .bss (NOLOAD) :
+            \\  .bss {s}:
             \\  {{
             \\    microzig_bss_start = .;
             \\    *(.sbss*)
@@ -227,10 +227,11 @@ pub fn main() !void {
             \\  }} > {s}
             \\
         , .{
-            if (parsed_args.ram_image)
-                ram_region_name
+            if (!parsed_args.ram_image)
+                try std.fmt.allocPrint(allocator, "{s} AT> {s}", .{ ram_region_name, flash_region_name })
             else
-                try std.fmt.allocPrint(allocator, "{s} AT> {s}", .{ ram_region_name, flash_region_name }),
+                ram_region_name,
+            if (!parsed_args.ram_image) "(NOLOAD) " else "",
             ram_region_name,
         });