Distinguish crt0 variants more clearly, update BIOS to use CTR variant (as it has no .data section).
This commit is contained in:
parent
8106008184
commit
0ff6d58605
|
@ -23,9 +23,9 @@ endif
|
||||||
|
|
||||||
bios.elf: $(BIOS_DIRECTORY)/linker.ld $(OBJECTS)
|
bios.elf: $(BIOS_DIRECTORY)/linker.ld $(OBJECTS)
|
||||||
|
|
||||||
%.elf: ../libbase/crt0-$(CPU).o ../libnet/libnet.a ../libbase/libbase-nofloat.a ../libcompiler_rt/libcompiler_rt.a
|
%.elf: ../libbase/crt0-$(CPU)-ctr.o ../libnet/libnet.a ../libbase/libbase-nofloat.a ../libcompiler_rt/libcompiler_rt.a
|
||||||
$(LD) $(LDFLAGS) -T $(BIOS_DIRECTORY)/linker.ld -N -o $@ \
|
$(LD) $(LDFLAGS) -T $(BIOS_DIRECTORY)/linker.ld -N -o $@ \
|
||||||
../libbase/crt0-$(CPU).o \
|
../libbase/crt0-$(CPU)-ctr.o \
|
||||||
$(OBJECTS) \
|
$(OBJECTS) \
|
||||||
-L../libnet \
|
-L../libnet \
|
||||||
-L../libbase \
|
-L../libbase \
|
||||||
|
|
|
@ -4,7 +4,7 @@ include $(SOC_DIRECTORY)/software/common.mak
|
||||||
OBJECTS=exception.o libc.o errno.o crc16.o crc32.o console.o \
|
OBJECTS=exception.o libc.o errno.o crc16.o crc32.o console.o \
|
||||||
system.o id.o uart.o time.o qsort.o strtod.o spiflash.o strcasecmp.o
|
system.o id.o uart.o time.o qsort.o strtod.o spiflash.o strcasecmp.o
|
||||||
|
|
||||||
all: crt0-$(CPU).o crt0-$(CPU)-flash.o libbase.a libbase-nofloat.a
|
all: crt0-$(CPU)-ctr.o crt0-$(CPU)-xip.o libbase.a libbase-nofloat.a
|
||||||
|
|
||||||
libbase.a: $(OBJECTS) vsnprintf.o
|
libbase.a: $(OBJECTS) vsnprintf.o
|
||||||
$(AR) crs libbase.a $(OBJECTS) vsnprintf.o
|
$(AR) crs libbase.a $(OBJECTS) vsnprintf.o
|
||||||
|
@ -24,8 +24,11 @@ vsnprintf-nofloat.o: $(LIBBASE_DIRECTORY)/vsnprintf.c
|
||||||
%.o: $(LIBBASE_DIRECTORY)/%.S
|
%.o: $(LIBBASE_DIRECTORY)/%.S
|
||||||
$(assemble)
|
$(assemble)
|
||||||
|
|
||||||
crt0-$(CPU)-flash.o: $(LIBBASE_DIRECTORY)/crt0-$(CPU).S
|
crt0-$(CPU)-ctr.o: $(LIBBASE_DIRECTORY)/crt0-$(CPU).S
|
||||||
$(CC) -c -DFLASH_DATA_SECTION $(CFLAGS) -o $@ $<
|
$(assemble)
|
||||||
|
|
||||||
|
crt0-$(CPU)-xip.o: $(LIBBASE_DIRECTORY)/crt0-$(CPU).S
|
||||||
|
$(CC) -c -DEXECUTE_IN_PLACE $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
.PHONY: all clean
|
.PHONY: all clean
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@ _crt0:
|
||||||
mvhi sp, hi(_fstack)
|
mvhi sp, hi(_fstack)
|
||||||
ori sp, sp, lo(_fstack)
|
ori sp, sp, lo(_fstack)
|
||||||
|
|
||||||
#ifdef FLASH_DATA_SECTION
|
#ifdef EXECUTE_IN_PLACE
|
||||||
/* Load DATA */
|
/* Load DATA */
|
||||||
mvhi r1, hi(_erodata)
|
mvhi r1, hi(_erodata)
|
||||||
ori r1, r1, lo(_erodata)
|
ori r1, r1, lo(_erodata)
|
||||||
|
|
Loading…
Reference in New Issue