diff --git a/src/bootloader/bootloader.ld b/link/bootloader.ld similarity index 100% rename from src/bootloader/bootloader.ld rename to link/bootloader.ld diff --git a/src/bootloader/bootloader_tlb.ld b/link/bootloader_tlb.ld similarity index 100% rename from src/bootloader/bootloader_tlb.ld rename to link/bootloader_tlb.ld diff --git a/src/link/link_ram.ld b/link/ram.ld similarity index 100% rename from src/link/link_ram.ld rename to link/ram.ld diff --git a/src/link/link_ram_tlb.ld b/link/ram_tlb.ld similarity index 100% rename from src/link/link_ram_tlb.ld rename to link/ram_tlb.ld diff --git a/src/link/link_rom.ld b/link/rom.ld similarity index 100% rename from src/link/link_rom.ld rename to link/rom.ld diff --git a/src/link/link_rom_tlb.ld b/link/rom_tlb.ld similarity index 100% rename from src/link/link_rom_tlb.ld rename to link/rom_tlb.ld diff --git a/make/mips_app.mk b/make/mips_app.mk index 55086eb..74d93b9 100644 --- a/make/mips_app.mk +++ b/make/mips_app.mk @@ -19,7 +19,7 @@ endif BUILD_DIR=build/$(BOARD)/$(ENDIANESS) LSYS_BUILD_DIR=libsys/build/$(BOARD)/$(ENDIANESS) -CFLAGS :=$(ENDIAN_FLAGS) -ffunction-sections -fdata-sections -Wl,--gc-sections -G 0 -Tlink/link_ram.ld -g -msoft-float -O2 -march=r3000 -I. -Ilibsys -Ilibsys/boards/$(BOARD) -L$(LSYS_BUILD_DIR) -Wl,-M +CFLAGS :=$(ENDIAN_FLAGS) -ffunction-sections -fdata-sections -Wl,--gc-sections -G 0 -T $(MIPS_HOME)/link/ram.ld -g -msoft-float -O2 -march=r3000 -I. -Ilibsys -Ilibsys/boards/$(BOARD) -L$(LSYS_BUILD_DIR) -Wl,-M ifeq ($(TLB),yes) CFLAGS+=-DSYS_IO_BASE=0xAC000000 -DSDRAM_BASE=0x80000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x88000000 else diff --git a/make/mips_boot.mk b/make/mips_boot.mk index ab9ff20..e573148 100644 --- a/make/mips_boot.mk +++ b/make/mips_boot.mk @@ -21,16 +21,17 @@ ifeq ($(DEBUGGER),mips) DBG_FLAGS := -DWITH_DEBUGGER DBG_OBJ := mips_dbg.o mips_dis.o endif - + + CFLAGS=$(ENDIAN_FLAGS) -Os -ffunction-sections -fdata-sections -I. -I../libsys -msoft-float -march=r3000 -G0 -I../libsys/boards/$(BOARD) -D$(BOARD) $(DBG_FLAGS) LFLAGS=$(ENDIAN_FLAGS) -Os -nostartfiles -nodefaultlibs -nostdlib -Wl,--gc-sections -Wl,-M ifeq ($(TLB),yes) CFLAGS+=-DSYS_IO_BASE=0xAC000000 -DSDRAM_BASE=0x80000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x88000000 - LFLAGS+=-T bootloader_tlb.ld + 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 bootloader.ld + LFLAGS+=-T $(MIPS_HOME)/link/bootloader.ld endif BUILD_DIR=./build/$(BOARD)/$(ENDIANESS)