diff --git a/firmware/target/coldfire/iaudio/app.lds b/firmware/target/coldfire/app.lds similarity index 99% rename from firmware/target/coldfire/iaudio/app.lds rename to firmware/target/coldfire/app.lds index 6a733ed07e..5364157fdd 100644 --- a/firmware/target/coldfire/iaudio/app.lds +++ b/firmware/target/coldfire/app.lds @@ -117,7 +117,7 @@ SECTIONS .audiobuf (NOLOAD) : { - . = ALIGN(4); + . = ALIGN(4); _audiobuffer = .; audiobuffer = .; } > DRAM diff --git a/firmware/target/coldfire/iriver/app.lds b/firmware/target/coldfire/iriver/app.lds deleted file mode 100644 index 56ccfca509..0000000000 --- a/firmware/target/coldfire/iriver/app.lds +++ /dev/null @@ -1,139 +0,0 @@ -#include "config.h" - -ENTRY(start) - -OUTPUT_FORMAT(elf32-m68k) -STARTUP(target/coldfire/crt0.o) - -#define PLUGINSIZE PLUGIN_BUFFER_SIZE -#define CODECSIZE CODEC_SIZE - -#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE - -#define DRAMORIG 0x31000000 -#define IRAMORIG 0x10000000 -#define IRAMSIZE 0xc000 - -/* End of the audio buffer, where the codec buffer starts */ -#define ENDAUDIOADDR (DRAMORIG + DRAMSIZE) - -/* Where the codec buffer ends, and the plugin buffer starts */ -#define ENDADDR (ENDAUDIOADDR + CODECSIZE) - -MEMORY -{ - DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE - IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE -} - -SECTIONS -{ - .vectors : - { - loadaddress = .; - _loadaddress = .; - KEEP(*(.resetvectors)); - *(.resetvectors); - KEEP(*(.vectors)); - *(.vectors); - } > DRAM - - .text : - { - . = ALIGN(0x200); - *(.init.text) - *(.text*) - . = ALIGN(0x4); - } > DRAM - - .rodata : - { - *(.rodata) /* problems without this, dunno why */ - *(.rodata*) - *(.rodata.str1.1) - *(.rodata.str1.4) - . = ALIGN(0x4); - - /* Pseudo-allocate the copies of the data sections */ - _datacopy = .; - } > DRAM - - /* TRICK ALERT! For RAM execution, we put the .data section at the - same load address as the copy. Thus, we don't waste extra RAM - when we don't actually need the copy. */ - .data : AT ( _datacopy ) - { - _datastart = .; - *(.data*) - . = ALIGN(0x4); - _dataend = .; - } > DRAM - - /DISCARD/ : - { - *(.eh_frame) - } - - .iram IRAMORIG : - { - _iramstart = .; - *(.icode) - *(.irodata) - *(.idata) - _iramend = .; - } > IRAM AT> DRAM - - _iramcopy = LOADADDR(.iram); - _noloaddram = LOADADDR(.iram); - - .ibss (NOLOAD) : - { - _iedata = .; - *(.ibss) - . = ALIGN(0x4); - _iend = .; - } > IRAM - - .stack (NOLOAD) : - { - *(.stack) - stackbegin = .; - . += 0x2000; - stackend = .; - } > IRAM - - .bss _noloaddram (NOLOAD) : - { - _edata = .; - *(.bss*) - *(COMMON) - . = ALIGN(0x4); - _end = .; - } > DRAM - - .audiobuf (NOLOAD) : - { - . = ALIGN(4); - _audiobuffer = .; - audiobuffer = .; - } > DRAM - - .audiobufend ENDAUDIOADDR (NOLOAD) : - { - audiobufend = .; - _audiobufend = .; - } > DRAM - - .codec ENDAUDIOADDR (NOLOAD) : - { - codecbuf = .; - _codecbuf = .; - } - - .plugin ENDADDR (NOLOAD) : - { - _pluginbuf = .; - pluginbuf = .; - } -} - diff --git a/firmware/target/coldfire/mpio/app.lds b/firmware/target/coldfire/mpio/app.lds deleted file mode 100644 index 56ccfca509..0000000000 --- a/firmware/target/coldfire/mpio/app.lds +++ /dev/null @@ -1,139 +0,0 @@ -#include "config.h" - -ENTRY(start) - -OUTPUT_FORMAT(elf32-m68k) -STARTUP(target/coldfire/crt0.o) - -#define PLUGINSIZE PLUGIN_BUFFER_SIZE -#define CODECSIZE CODEC_SIZE - -#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE - -#define DRAMORIG 0x31000000 -#define IRAMORIG 0x10000000 -#define IRAMSIZE 0xc000 - -/* End of the audio buffer, where the codec buffer starts */ -#define ENDAUDIOADDR (DRAMORIG + DRAMSIZE) - -/* Where the codec buffer ends, and the plugin buffer starts */ -#define ENDADDR (ENDAUDIOADDR + CODECSIZE) - -MEMORY -{ - DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE - IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE -} - -SECTIONS -{ - .vectors : - { - loadaddress = .; - _loadaddress = .; - KEEP(*(.resetvectors)); - *(.resetvectors); - KEEP(*(.vectors)); - *(.vectors); - } > DRAM - - .text : - { - . = ALIGN(0x200); - *(.init.text) - *(.text*) - . = ALIGN(0x4); - } > DRAM - - .rodata : - { - *(.rodata) /* problems without this, dunno why */ - *(.rodata*) - *(.rodata.str1.1) - *(.rodata.str1.4) - . = ALIGN(0x4); - - /* Pseudo-allocate the copies of the data sections */ - _datacopy = .; - } > DRAM - - /* TRICK ALERT! For RAM execution, we put the .data section at the - same load address as the copy. Thus, we don't waste extra RAM - when we don't actually need the copy. */ - .data : AT ( _datacopy ) - { - _datastart = .; - *(.data*) - . = ALIGN(0x4); - _dataend = .; - } > DRAM - - /DISCARD/ : - { - *(.eh_frame) - } - - .iram IRAMORIG : - { - _iramstart = .; - *(.icode) - *(.irodata) - *(.idata) - _iramend = .; - } > IRAM AT> DRAM - - _iramcopy = LOADADDR(.iram); - _noloaddram = LOADADDR(.iram); - - .ibss (NOLOAD) : - { - _iedata = .; - *(.ibss) - . = ALIGN(0x4); - _iend = .; - } > IRAM - - .stack (NOLOAD) : - { - *(.stack) - stackbegin = .; - . += 0x2000; - stackend = .; - } > IRAM - - .bss _noloaddram (NOLOAD) : - { - _edata = .; - *(.bss*) - *(COMMON) - . = ALIGN(0x4); - _end = .; - } > DRAM - - .audiobuf (NOLOAD) : - { - . = ALIGN(4); - _audiobuffer = .; - audiobuffer = .; - } > DRAM - - .audiobufend ENDAUDIOADDR (NOLOAD) : - { - audiobufend = .; - _audiobufend = .; - } > DRAM - - .codec ENDAUDIOADDR (NOLOAD) : - { - codecbuf = .; - _codecbuf = .; - } - - .plugin ENDADDR (NOLOAD) : - { - _pluginbuf = .; - pluginbuf = .; - } -} - diff --git a/tools/root.make b/tools/root.make index 9e8513ba48..dcdbba23c1 100644 --- a/tools/root.make +++ b/tools/root.make @@ -201,7 +201,11 @@ ifndef APP_TYPE ## target build CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h +ifeq ($(wildcard $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds),) +RAMLDS := $(FIRMDIR)/target/$(CPU)/app.lds +else RAMLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds +endif LINKRAM := $(BUILDDIR)/ram.link ROMLDS := $(FIRMDIR)/rom.lds LINKROM := $(BUILDDIR)/rom.link