Merge pull request #67 from cr1901/data-crt0

firmware: Update litex submodule, Makefiles, and linker scripts to support crt0-flash startup code.
timvideos · Oct 1, 2018 · 5760a16 · 5760a16
2 parents 585c1d4 + 2f9efff
commit 5760a16
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/firmware/Makefile b/firmware/Makefile
@@ -66,9 +66,11 @@ include $(UIP_DIRECTORY)/Makefile.mk
 LDFLAGS += \
 
 ifeq ($(COPY_TO_MAIN_RAM), 1)
-LINKER_LD = linker.ld
+CRT0 = ../libbase/crt0-$(CPU)-ctr.o
+LINKER_LD = linker-ctr.ld
 else
-LINKER_LD = linker-flash.ld
+CRT0 = ../libbase/crt0-$(CPU)-xip.o
+LINKER_LD = linker-xip.ld
 endif
 
 all: firmware.bin firmware.fbi
@@ -82,11 +84,11 @@ all: firmware.bin firmware.fbi
 
 firmware.elf: $(FIRMWARE_DIRECTORY)/$(LINKER_LD) $(OBJECTS)
 
-%.elf: ../libbase/crt0-$(CPU).o ../libbase/libbase-nofloat.a ../libcompiler_rt/libcompiler_rt.a ../uip/libuip.a
+%.elf: $(CRT0) ../libbase/libbase-nofloat.a ../libcompiler_rt/libcompiler_rt.a ../uip/libuip.a
 	$(LD) $(LDFLAGS) \
 		-T $(FIRMWARE_DIRECTORY)/$(LINKER_LD) \
 		-N -o $@ \
-                ../libbase/crt0-$(CPU).o \
+                $(CRT0) \
                 $(OBJECTS) \
                 -L../libbase \
 		-lbase-nofloat \

diff --git a/firmware/linker.ld → firmware/linker-ctr.ld b/firmware/linker.ld → firmware/linker-ctr.ld
diff --git a/firmware/linker-flash.ld → firmware/linker-xip.ld b/firmware/linker-flash.ld → firmware/linker-xip.ld
@@ -28,15 +28,15 @@ SECTIONS
 		_erodata = .;
 	} > user_flash
 
-	.data :
+	.data : AT (ADDR(.rodata) + SIZEOF (.rodata))
 	{
 		. = ALIGN(4);
 		_fdata = .;
 		*(.data .data.* .gnu.linkonce.d.*)
 		*(.data1)
 		_gp = ALIGN(16);
 		*(.sdata .sdata.* .gnu.linkonce.s.*)
-		_edata = .;
+		_edata = ALIGN(16); /* Make sure _edata is >= _gp. */
 	} > sram
 
 	.bss :

diff --git a/firmware/stub/Makefile b/firmware/stub/Makefile
@@ -31,11 +31,11 @@ all: firmware.bin firmware.fbi
 
 firmware.elf: $(STUB_DIRECTORY)/$(LINKER_LD) $(OBJECTS)
 
-%.elf: ../libbase/crt0-$(CPU).o ../libbase/libbase-nofloat.a ../libcompiler_rt/libcompiler_rt.a
+%.elf: ../libbase/crt0-$(CPU)-xip.o ../libbase/libbase-nofloat.a ../libcompiler_rt/libcompiler_rt.a
 	$(LD) $(LDFLAGS) \
 		-T $(STUB_DIRECTORY)/$(LINKER_LD) \
 		-N -o $@ \
-        ../libbase/crt0-$(CPU).o \
+        ../libbase/crt0-$(CPU)-xip.o \
         $(OBJECTS) \
         -L../libbase \
 		-lbase-nofloat \

diff --git a/firmware/stub/linker.ld b/firmware/stub/linker.ld
@@ -28,15 +28,15 @@ SECTIONS
 		_erodata = .;
 	} > user_flash
 
-	.data :
+	.data : AT (ADDR(.rodata) + SIZEOF (.rodata))
 	{
 		. = ALIGN(4);
 		_fdata = .;
 		*(.data .data.* .gnu.linkonce.d.*)
 		*(.data1)
 		_gp = ALIGN(16);
 		*(.sdata .sdata.* .gnu.linkonce.s.*)
-		_edata = .;
+		_edata = ALIGN(16); /* Make sure _edata is >= _gp. */
 	} > sram
 
 	.bss :

diff --git a/third_party/litex b/third_party/litex