*/app.lds: remove STUBOFFSET

This is related to gdb, and gdb can only work on SH and ifp
This was mistakenly kept when app.lds was forked for each SoC
Side-effect: fix DEBUG builds when the rockbox binary is expected to
be loaded at the start of DRAM and there is no runtime relocation

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28124 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-09-20 17:09:55 +00:00
parent 7240478457
commit 66f8fb52a9
20 changed files with 41 additions and 167 deletions

View file

@ -10,28 +10,18 @@ STARTUP(target/arm/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define IRAMORIG IRAM_ORIG
#define DRAMORIG (DRAM_ORIG + STUBOFFSET)
/* End of the audio buffer, where the codec buffer starts */ /* End of the audio buffer, where the codec buffer starts */
#define ENDAUDIOADDR (DRAMORIG + DRAMSIZE) #define ENDAUDIOADDR (DRAM_ORIG + DRAMSIZE)
#define CODEC_BUFFER_FILLS_IRAM defined(AMS_LOWMEM) || (CONFIG_CPU == AS3525v2) #define CODEC_BUFFER_FILLS_IRAM defined(AMS_LOWMEM) || (CONFIG_CPU == AS3525v2)
#if CODEC_BUFFER_FILLS_IRAM #if CODEC_BUFFER_FILLS_IRAM
/* Entire codec buffer in IRAM */ /* Entire codec buffer in IRAM */
#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - TTB_SIZE) #define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - TTB_SIZE)
#define CODECORIG (IRAMORIG + (IRAM_SIZE - CODEC_SIZE)) #define CODECORIG (IRAM_ORIG + (IRAM_SIZE - CODEC_SIZE))
#define IRAMSIZE (IRAM_SIZE - CODEC_SIZE) #define IRAMSIZE (IRAM_SIZE - CODEC_SIZE)
#else #else
#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE - TTB_SIZE) #define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE - TTB_SIZE)
#define CODECORIG (ENDAUDIOADDR) #define CODECORIG (ENDAUDIOADDR)
#define IRAMSIZE (0x20000) #define IRAMSIZE (0x20000)
#endif #endif
@ -49,8 +39,8 @@ MEMORY
#if CODEC_BUFFER_FILLS_IRAM #if CODEC_BUFFER_FILLS_IRAM
CODEC_IRAM : ORIGIN = CODECORIG, LENGTH = CODEC_SIZE CODEC_IRAM : ORIGIN = CODECORIG, LENGTH = CODEC_SIZE
#endif #endif
IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE IRAM : ORIGIN = IRAM_ORIG, LENGTH = IRAMSIZE
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE DRAM : ORIGIN = DRAM_ORIG, LENGTH = DRAMSIZE
} }
SECTIONS SECTIONS

View file

@ -9,18 +9,12 @@ STARTUP(target/arm/imx31/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#include "imx31l.h" #include "imx31l.h"
/* Subtract 1MB for the FRAME/TTB section */ /* Subtract 1MB for the FRAME/TTB section */
#define DRAMSIZE ((MEMORYSIZE * 0x100000) - STUBOFFSET - CODECSIZE - \ #define DRAMSIZE ((MEMORYSIZE * 0x100000) - CODECSIZE - \
PLUGINSIZE - QHARRAY_SIZE - FRAME_SIZE - TTB_SIZE) PLUGINSIZE - QHARRAY_SIZE - FRAME_SIZE - TTB_SIZE)
#define DRAMORIG (0x0 + STUBOFFSET) #define DRAMORIG 0x0
/* #define IRAMORIG 0x1FFFC000 */ /* #define IRAMORIG 0x1FFFC000 */
#define IRAMORIG DRAMORIG #define IRAMORIG DRAMORIG
#define IRAM DRAM #define IRAM DRAM

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,16 +9,10 @@ STARTUP(target/arm/s3c2440/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#include "cpu.h" #include "cpu.h"
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGINSIZE - CODECSIZE - LCD_BUFFER_SIZE - TTB_SIZE #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE - LCD_BUFFER_SIZE - TTB_SIZE
#define DRAMORIG 0x00000000 + STUBOFFSET #define DRAMORIG 0x00000000
/* End of the audio buffer, where the codec buffer starts */ /* End of the audio buffer, where the codec buffer starts */
#define ENDAUDIOADDR (DRAMORIG + DRAMSIZE) #define ENDAUDIOADDR (DRAMORIG + DRAMSIZE)

View file

@ -10,13 +10,6 @@ STARTUP(target/arm/s5l8700/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define IRAMORIG 0x0 #define IRAMORIG 0x0
#define DRAMORIG 0x08000000 #define DRAMORIG 0x08000000
@ -25,7 +18,7 @@ STARTUP(target/arm/s5l8700/crt0.o)
#define DRAM_SIZE (MEMORYSIZE * 0x100000) #define DRAM_SIZE (MEMORYSIZE * 0x100000)
#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE) #define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE)
#define CODECORIG (ENDAUDIOADDR) #define CODECORIG (ENDAUDIOADDR)
#if CONFIG_CPU==S5L8700 #if CONFIG_CPU==S5L8700
#define IRAMSIZE (128*1024) /* 256KB total - 128KB for core, 128KB for plugins */ #define IRAMSIZE (128*1024) /* 256KB total - 128KB for core, 128KB for plugins */

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x00000000
#define DRAMORIG 0x00000000 + STUBOFFSET
#define IRAMORIG 0x40000000 #define IRAMORIG 0x40000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -7,14 +7,8 @@ STARTUP(target/arm/tcc77x/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define DRAMORIG 0x20000000 #define DRAMORIG 0x20000000
#define IRAMORIG 0x00000000 #define IRAMORIG 0x00000000

View file

@ -9,16 +9,10 @@ STARTUP(target/arm/tcc780x/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#include "cpu.h" #include "cpu.h"
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGINSIZE - CODECSIZE - TTB_SIZE #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE - TTB_SIZE
#define DRAMORIG 0x20000000 + STUBOFFSET #define DRAMORIG 0x20000000
#define ITCMORIG 0x00000000 #define ITCMORIG 0x00000000
#define ITCMSIZE 0x1000 #define ITCMSIZE 0x1000
#define DTCMORIG 0xA0000000 #define DTCMORIG 0xA0000000

View file

@ -6,12 +6,6 @@ OUTPUT_FORMAT(elf32-littlearm)
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
STARTUP(target/arm/tms320dm320/crt0.o) STARTUP(target/arm/tms320dm320/crt0.o)
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#ifndef LCD_NATIVE_WIDTH #ifndef LCD_NATIVE_WIDTH
#define LCD_NATIVE_WIDTH LCD_WIDTH #define LCD_NATIVE_WIDTH LCD_WIDTH
#endif #endif
@ -33,9 +27,9 @@ STARTUP(target/arm/tms320dm320/crt0.o)
*/ */
#define LCD_TTB_AREA 0x100000*((LCD_BUFFER_SIZE>>19)+1) #define LCD_TTB_AREA 0x100000*((LCD_BUFFER_SIZE>>19)+1)
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET #define DRAMSIZE (MEMORYSIZE * 0x100000)
#define DRAMORIG 0x00900000 + STUBOFFSET #define DRAMORIG 0x00900000
#define IRAMORIG 0x00000000 #define IRAMORIG 0x00000000
#define IRAMSIZE 0x4000 #define IRAMSIZE 0x4000

View file

@ -6,12 +6,6 @@ OUTPUT_FORMAT(elf32-littlearm)
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
STARTUP(target/arm/tms320dm320/crt0.o) STARTUP(target/arm/tms320dm320/crt0.o)
#ifdef DEBUG
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#ifndef LCD_NATIVE_WIDTH #ifndef LCD_NATIVE_WIDTH
#define LCD_NATIVE_WIDTH LCD_WIDTH #define LCD_NATIVE_WIDTH LCD_WIDTH
#endif #endif
@ -35,7 +29,7 @@ STARTUP(target/arm/tms320dm320/crt0.o)
#define BOOT_OFFSET 0x1000000 #define BOOT_OFFSET 0x1000000
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - BOOT_OFFSET #define DRAMSIZE (MEMORYSIZE * 0x100000) - BOOT_OFFSET
#define DRAMORIG (0x00900000+BOOT_OFFSET) /* actually it's 0x00900000 */ #define DRAMORIG (0x00900000+BOOT_OFFSET) /* actually it's 0x00900000 */
#define IRAMORIG 0x00000000 #define IRAMORIG 0x00000000

View file

@ -8,15 +8,9 @@ STARTUP(target/coldfire/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x31000000
#define DRAMORIG 0x31000000 + STUBOFFSET
#define IRAMORIG 0x10000000 #define IRAMORIG 0x10000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -8,15 +8,9 @@ STARTUP(target/coldfire/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x31000000
#define DRAMORIG 0x31000000 + STUBOFFSET
#define IRAMORIG 0x10000000 #define IRAMORIG 0x10000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -8,15 +8,9 @@ STARTUP(target/coldfire/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#ifdef DEBUG #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
#define STUBOFFSET 0x10000
#else
#define STUBOFFSET 0
#endif
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMORIG 0x31000000
#define DRAMORIG 0x31000000 + STUBOFFSET
#define IRAMORIG 0x10000000 #define IRAMORIG 0x10000000
#define IRAMSIZE 0xc000 #define IRAMSIZE 0xc000

View file

@ -5,15 +5,8 @@ OUTPUT_ARCH(MIPS)
ENTRY(_start) ENTRY(_start)
STARTUP(target/mips/ingenic_jz47xx/crt0.o) STARTUP(target/mips/ingenic_jz47xx/crt0.o)
#ifdef DEBUG #define DRAMORIG 0x80004000
#define STUBOFFSET 0x10000 #define DRAMSIZE (MEMORYSIZE * 0x100000)
#else
#define STUBOFFSET 0
#endif
#define DRAMORIG 0x80004000 + STUBOFFSET
#define DRAMSIZE (MEMORYSIZE * 0x100000 - STUBOFFSET)
#define IRAMORIG 0x80000000 #define IRAMORIG 0x80000000
#define IRAMSIZE 16K #define IRAMSIZE 16K