software: share crt0

m-labs · Jul 11, 2013 · 25506c1 · 25506c1
1 parent aa5cdd5
commit 25506c1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 172 deletions.
diff --git a/software/bios/Makefile b/software/bios/Makefile
@@ -1,7 +1,7 @@
 M2DIR=../..
 include $(M2DIR)/software/common.mak
 
-OBJECTS=crt0.o isr.o sdram.o main.o boot-helper.o boot.o dataflow.o
+OBJECTS=isr.o sdram.o main.o boot-helper.o boot.o dataflow.o
 
 all: bios.bin
 
@@ -17,7 +17,9 @@ all: bios.bin
 bios.elf: linker.ld $(OBJECTS) libs
 
 %.elf:
-	$(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) \
+	$(LD) $(LDFLAGS) -T $< -N -o $@ \
+		$(M2DIR)/software/libbase/crt0.o \
+		$(OBJECTS) \
 		-L$(M2DIR)/software/libnet \
 		-L$(M2DIR)/software/libbase \
 		-L$(M2DIR)/software/libcompiler-rt \

diff --git a/software/libbase/Makefile b/software/libbase/Makefile
@@ -3,7 +3,7 @@ include $(M2DIR)/software/common.mak
 
 OBJECTS=setjmp.o libc.o errno.o crc16.o crc32.o console.o system.o id.o uart.o qsort.o strtod.o
 
-all: libbase.a libbase-nofloat.a
+all: crt0.o libbase.a libbase-nofloat.a
 
 # pull in dependency info for *existing* .o files
 -include $(OBJECTS:.o=.d)

diff --git a/software/bios/crt0.S → software/libbase/crt0.S b/software/bios/crt0.S → software/libbase/crt0.S
diff --git a/software/videomixer/Makefile b/software/videomixer/Makefile
@@ -1,7 +1,7 @@
 M2DIR=../..
 include $(M2DIR)/software/common.mak
 
-OBJECTS=crt0.o isr.o time.o fb.o dvisampler0.o dvisampler1.o main.o
+OBJECTS=isr.o time.o fb.o dvisampler0.o dvisampler1.o main.o
 
 all: videomixer.bin videomixer.fbi
 
@@ -18,7 +18,9 @@ all: videomixer.bin videomixer.fbi
 videomixer.elf: linker.ld $(OBJECTS) libs
 
 %.elf:
-	$(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) \
+	$(LD) $(LDFLAGS) -T $< -N -o $@ \
+		$(M2DIR)/software/libbase/crt0.o \
+		$(OBJECTS) \
 		-L$(M2DIR)/software/libbase \
 		-L$(M2DIR)/software/libcompiler-rt \
 		-lbase -lcompiler-rt

diff --git a/software/videomixer/crt0.S b/software/videomixer/crt0.S