ysyx,loader: refine Makefile

OSCPU · Sep 8, 2021 · 73e89f0 · 73e89f0
1 parent 9f7b706
commit 73e89f0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/ysyx/loader/.gitignore b/ysyx/loader/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/ysyx/loader/Makefile b/ysyx/loader/Makefile
@@ -1,5 +1,15 @@
-SRCS ?= loader.c resource.S
-NAME ?= loader
-_BIN ?= hello.bin
+SRCS = loader.c payload.S
+NAME = loader
+
+# Note that the loader should be linked to the start address of flash.
+# You should modify your linking option if you want to build the loader yourself.
+# Then modify BIN_PATH to a binary starting at 0x80000000
+BIN_PATH = hello-riscv64-mycpu-start-at-0x80000000.bin
+ASFLAGS += -DBIN_PATH=\"$(BIN_PATH)\"
 
 include $(AM_HOME)/Makefile
+
+payload.S: $(BIN_PATH)
+	touch $@
+
+.PHONY: payload.S
diff --git a/ysyx/loader/resource.S → ysyx/loader/payload.S b/ysyx/loader/resource.S → ysyx/loader/payload.S
@@ -1,6 +1,8 @@
 .section .rodata
+.align 3
 .global program_start, program_end
 program_start:
-.incbin _BIN
+#ifdef BIN_PATH
+.incbin BIN_PATH
+#endif
 program_end:
-