Skip to content

Commit 2de823e

Browse files
author
Felix "xq" Queißner
committed
more adjustments at work
1 parent 6e4faa6 commit 2de823e

File tree

6 files changed

+9
-13
lines changed

6 files changed

+9
-13
lines changed

core/src/cpus/cortex_m.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ pub const startup_logic = struct {
671671
const VectorTable = microzig.chip.VectorTable;
672672

673673
// will be imported by microzig.zig to allow system startup.
674-
pub const _vector_table: VectorTable = blk: {
674+
pub const _vector_table: VectorTable align(256) = blk: {
675675
var tmp: VectorTable = .{
676676
.initial_stack_pointer = microzig.config.end_of_stack,
677677
.Reset = .{ .c = microzig.cpu.startup_logic._start },

port/nordic/nrf5x/build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.@"microzig/build-internals" = .{ .path = "../../../build-internals" },
77
.nrfx = .{
88
.url = "https://github.com/NordicSemiconductor/nrfx/archive/refs/tags/v3.11.0.tar.gz",
9-
.hash = "N-V-__8AAL14nQqnG5u7x0tgCPSFD6MxfgtRMqGawtXN3C0S",
9+
.hash = "N-V-__8AABC-kgxbmC3Prd8fgisfbLs1giU34ofX1vz9bwaA",
1010
},
1111
},
1212
.paths = .{

port/raspberrypi/rp2xxx/build.zig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,6 @@ pub fn init(dep: *std.Build.Dependency) Self {
197197
.root_source_file = b.path("src/boards/raspberry_pi_pico2.zig"),
198198
},
199199
}),
200-
.pico2_arm_flashless = chip_rp2350_arm.derive(.{
201-
.ram_image = true,
202-
.board = .{
203-
.name = "RaspberryPi Pico 2",
204-
.url = "https://www.raspberrypi.com/products/raspberry-pi-pico2/",
205-
.root_source_file = b.path("src/boards/raspberry_pi_pico2.zig"),
206-
},
207-
}),
208200
.pico2_arm_flashless = chip_rp2350_arm.derive(.{
209201
.ram_image = true,
210202
.linker_script = .{

port/raspberrypi/rp2xxx/src/hal/pio/assembler.zig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ pub fn assemble_impl(comptime chip: Chip, comptime source: []const u8, diags: *?
7979
for (encoder_output.programs.slice()) |bounded|
8080
try programs.append(bounded.to_exported_program());
8181

82+
const program_copy = programs.buffer[0..programs.len].*;
83+
8284
return Output{
8385
.defines = blk: {
8486
var tmp = std.BoundedArray(Define, options.encode.max_defines).init(0) catch unreachable;
@@ -87,9 +89,10 @@ pub fn assemble_impl(comptime chip: Chip, comptime source: []const u8, diags: *?
8789
.name = define.name,
8890
.value = define.value,
8991
}) catch unreachable;
90-
break :blk tmp.constSlice();
92+
const copy = tmp.buffer[0..tmp.len].*;
93+
break :blk ©
9194
},
92-
.programs = programs.constSlice(),
95+
.programs = &program_copy,
9396
};
9497
}
9598

port/raspberrypi/rp2xxx/src/hal/pio/common.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ pub fn PioImpl(EnumType: type, chip: Chip) type {
537537

538538
// TODO: check program settings vs pin mapping
539539
const offset = try self.add_program(program);
540+
540541
self.sm_init(sm, offset, .{
541542
.clkdiv = options.clkdiv,
542543
.shift = options.shift,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pub const UART = enum(u1) {
153153
return .{ .context = uart };
154154
}
155155

156-
fn get_regs(uart: UART) *volatile UartRegs {
156+
pub fn get_regs(uart: UART) *volatile UartRegs {
157157
return switch (@intFromEnum(uart)) {
158158
0 => UART0_reg,
159159
1 => UART1_reg,

0 commit comments

Comments
 (0)