@@ -5,13 +5,12 @@ pub fn build(b: *std.build.Builder) !void {
5
5
build_exe .emit_asm = true ;
6
6
build_exe .install ();
7
7
build_exe .setBuildMode (b .standardReleaseOptions ());
8
- build_exe .setLinkerScriptPath (Linker . script_file_name );
8
+ build_exe .setLinkerScriptPath ("linker_script.ld" );
9
9
build_exe .setTarget (model .target );
10
10
build_exe .link_function_sections = true ;
11
11
break :buildExeDetails 0 ;
12
12
};
13
- const format_source = b .addFmt (&[_ ][]const u8 { "build.zig" , "linker.zig" , "main.zig" , "system_model.zig" , "generated/generated_linker_files/generated_prepare_memory.zig" });
14
- const generate_linker_files = Linker .addGenerateLinkerFilesStep (b , model );
13
+ const format_source = b .addFmt (&[_ ][]const u8 { "build.zig" , "main.zig" });
15
14
const install_raw = b .addInstallRaw (build_exe , "main.img" );
16
15
const make_hex_file = addCustomStep (b , MakeHexFileStep { .input_name = "zig-cache/bin/main.img" , .output_name = "main.hex" });
17
16
const run_qemu = b .addSystemCommand (&[_ ][]const u8 {
@@ -27,9 +26,7 @@ pub fn build(b: *std.build.Builder) !void {
27
26
});
28
27
29
28
_ = declareDependencies : {
30
- format_source .step .dependOn (& generate_linker_files .step );
31
29
build_exe .step .dependOn (& format_source .step );
32
- build_exe .step .dependOn (& generate_linker_files .step );
33
30
install_raw .step .dependOn (& build_exe .step );
34
31
make_hex_file .step .dependOn (& install_raw .step );
35
32
run_qemu .step .dependOn (& install_raw .step );
@@ -56,7 +53,7 @@ const MakeHexFileStep = struct {
56
53
const hex = try cwd .createFile (self .output_name , fs.File.CreateFlags {});
57
54
defer hex .close ();
58
55
var offset : usize = 0 ;
59
- var read_buf : [model .flash .size ]u8 = undefined ;
56
+ var read_buf : [model .memory . flash .size ]u8 = undefined ;
60
57
while (true ) {
61
58
var n = try image .read (& read_buf );
62
59
if (n == 0 ) {
@@ -102,6 +99,5 @@ pub fn addCustomStep(self: *std.build.Builder, customStep: anytype) *@TypeOf(cus
102
99
}
103
100
104
101
const fs = std .fs ;
105
- const Linker = @import ("linker.zig" );
106
102
const model = @import ("system_model.zig" );
107
103
const std = @import ("std" );
0 commit comments