diff --git a/make/mips_boot.mk b/make/mips_boot.mk index 95ea54a..3739ac0 100644 --- a/make/mips_boot.mk +++ b/make/mips_boot.mk @@ -7,23 +7,9 @@ WITH_TLB ?= n ENDIANESS ?= eb DEBUGGER ?= n -ifeq ($(ENDIANESS),el) - ENDIAN_FLAGS=-EL -else - ENDIAN_FLAGS=-EB -endif +include ../../make/compile.mk -FLAGS := -fno-exceptions -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -nostartfiles -nodefaultlibs -nostdlib -CFLAGS=$(ENDIAN_FLAGS) $(FLAGS) -Os -I. -I../libsys -msoft-float -march=r3000 -G0 -I../libsys/boards/$(BOARD) -D$(BOARD) -LFLAGS=$(ENDIAN_FLAGS) $(FLAGS) -Os - -ifeq ($(TLB),yes) - CFLAGS+=-DSYS_IO_BASE=0xAC000000 -DSDRAM_BASE=0x80000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x88000000 - LFLAGS+=-T $(MIPS_HOME)/link/bootloader_tlb.ld -else - CFLAGS+=-DSYS_IO_BASE=0xA0000000 -DSDRAM_BASE=0x40000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x00000000 - LFLAGS+=-T $(MIPS_HOME)/link/bootloader.ld -endif +CFLAGS += -Os -G0 -I. -I../libsys -I../libsys/boards/$(BOARD) -T $(MIPS_HOME)/link/bootloader.ld BUILD_DIR=./build/$(BOARD)/$(ENDIANESS) diff --git a/src/bootloader/Makefile b/src/bootloader/Makefile index baecd92..a183b7b 100644 --- a/src/bootloader/Makefile +++ b/src/bootloader/Makefile @@ -34,7 +34,7 @@ $(BUILD_DIR)/%.o : %.S $(BUILD_DIR)/bootloader.elf: $(OBJS-$(BOARD)) bootloader.c $(CC) $(CFLAGS) -o $(BUILD_DIR)/bootloader.o -g -c bootloader.c - $(LD) $(LFLAGS) $(LIB_DIRS) $(OBJS-$(BOARD)) $(BUILD_DIR)/bootloader.o -o $@ $(LIBS) >$@.map + $(CC) $(CFLAGS) $(LIB_DIRS) $(OBJS-$(BOARD)) $(BUILD_DIR)/bootloader.o -o $@ $(LIBS) >$@.map $(OBJDUMP) -D $@ > $@.dis $(OBJCOPY) $@ -j ROM --output-target=binary $@.ROM.bin $(OBJCOPY) -O srec $@ $@.srec @@ -43,7 +43,7 @@ $(BUILD_DIR)/bootloader.elf: $(OBJS-$(BOARD)) bootloader.c $(BUILD_DIR)/bootloader_with_flash.elf: $(OBJS-$(BOARD)) bootloader_with_flash.c ../cfiflash.c $(CC) $(CFLAGS) -o $(BUILD_DIR)/bootloader_with_flash.o -g -c bootloader_with_flash.c $(CC) $(CFLAGS) -o $(BUILD_DIR)/cfiflash.o -g -c ../cfiflash.c - $(LD) $(LFLAGS) $(LIB_DIRS) $(OBJS-$(BOARD)) $(BUILD_DIR)/cfiflash.o $(BUILD_DIR)/bootloader_with_flash.o -o $@ $(LIBS) >$@.map + $(CC) $(CFLAGS) $(LIB_DIRS) $(OBJS-$(BOARD)) $(BUILD_DIR)/cfiflash.o $(BUILD_DIR)/bootloader_with_flash.o -o $@ $(LIBS) >$@.map $(OBJDUMP) -D $@ > $@.dis $(OBJCOPY) $@ -j ROM --output-target=binary $@.ROM.bin $(OBJCOPY) -O srec $@ $@.srec