From 66f8fb52a9114ece70e1771119096589004d29f0 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Mon, 20 Sep 2010 17:09:55 +0000 Subject: */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 --- firmware/target/arm/as3525/app.lds | 22 ++++++---------------- firmware/target/arm/imx31/app.lds | 10 ++-------- firmware/target/arm/ipod/app.lds | 10 ++-------- firmware/target/arm/iriver/app.lds | 10 ++-------- firmware/target/arm/olympus/app.lds | 10 ++-------- firmware/target/arm/pbell/app.lds | 10 ++-------- firmware/target/arm/philips/app.lds | 10 ++-------- firmware/target/arm/s3c2440/app.lds | 10 ++-------- firmware/target/arm/s5l8700/app.lds | 9 +-------- firmware/target/arm/samsung/app.lds | 10 ++-------- firmware/target/arm/sandisk/app.lds | 10 ++-------- firmware/target/arm/tatung/app.lds | 10 ++-------- firmware/target/arm/tcc77x/app.lds | 8 +------- firmware/target/arm/tcc780x/app.lds | 10 ++-------- firmware/target/arm/tms320dm320/app.lds | 10 ++-------- firmware/target/arm/tms320dm320/boot.lds | 8 +------- firmware/target/coldfire/iaudio/app.lds | 10 ++-------- firmware/target/coldfire/iriver/app.lds | 10 ++-------- firmware/target/coldfire/mpio/app.lds | 10 ++-------- firmware/target/mips/ingenic_jz47xx/app.lds | 11 ++--------- 20 files changed, 41 insertions(+), 167 deletions(-) diff --git a/firmware/target/arm/as3525/app.lds b/firmware/target/arm/as3525/app.lds index e19ff13878..b24a2cf00b 100644 --- a/firmware/target/arm/as3525/app.lds +++ b/firmware/target/arm/as3525/app.lds @@ -10,28 +10,18 @@ STARTUP(target/arm/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_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 */ -#define ENDAUDIOADDR (DRAMORIG + DRAMSIZE) +#define ENDAUDIOADDR (DRAM_ORIG + DRAMSIZE) #define CODEC_BUFFER_FILLS_IRAM defined(AMS_LOWMEM) || (CONFIG_CPU == AS3525v2) #if CODEC_BUFFER_FILLS_IRAM /* Entire codec buffer in IRAM */ -#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - TTB_SIZE) -#define CODECORIG (IRAMORIG + (IRAM_SIZE - CODEC_SIZE)) +#define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - TTB_SIZE) +#define CODECORIG (IRAM_ORIG + (IRAM_SIZE - CODEC_SIZE)) #define IRAMSIZE (IRAM_SIZE - CODEC_SIZE) #else -#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE - TTB_SIZE) +#define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE - TTB_SIZE) #define CODECORIG (ENDAUDIOADDR) #define IRAMSIZE (0x20000) #endif @@ -49,8 +39,8 @@ MEMORY #if CODEC_BUFFER_FILLS_IRAM CODEC_IRAM : ORIGIN = CODECORIG, LENGTH = CODEC_SIZE #endif - IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE - DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE + IRAM : ORIGIN = IRAM_ORIG, LENGTH = IRAMSIZE + DRAM : ORIGIN = DRAM_ORIG, LENGTH = DRAMSIZE } SECTIONS diff --git a/firmware/target/arm/imx31/app.lds b/firmware/target/arm/imx31/app.lds index d8d7f4c642..ebfd2e9c60 100644 --- a/firmware/target/arm/imx31/app.lds +++ b/firmware/target/arm/imx31/app.lds @@ -9,18 +9,12 @@ STARTUP(target/arm/imx31/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - #include "imx31l.h" /* 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) -#define DRAMORIG (0x0 + STUBOFFSET) +#define DRAMORIG 0x0 /* #define IRAMORIG 0x1FFFC000 */ #define IRAMORIG DRAMORIG #define IRAM DRAM diff --git a/firmware/target/arm/ipod/app.lds b/firmware/target/arm/ipod/app.lds index f8e6906a4c..3fe08feddd 100644 --- a/firmware/target/arm/ipod/app.lds +++ b/firmware/target/arm/ipod/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/iriver/app.lds b/firmware/target/arm/iriver/app.lds index ec26fdbe38..de355c30b0 100644 --- a/firmware/target/arm/iriver/app.lds +++ b/firmware/target/arm/iriver/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/olympus/app.lds b/firmware/target/arm/olympus/app.lds index ec26fdbe38..de355c30b0 100644 --- a/firmware/target/arm/olympus/app.lds +++ b/firmware/target/arm/olympus/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/pbell/app.lds b/firmware/target/arm/pbell/app.lds index ec26fdbe38..de355c30b0 100644 --- a/firmware/target/arm/pbell/app.lds +++ b/firmware/target/arm/pbell/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/philips/app.lds b/firmware/target/arm/philips/app.lds index ec26fdbe38..de355c30b0 100644 --- a/firmware/target/arm/philips/app.lds +++ b/firmware/target/arm/philips/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/s3c2440/app.lds b/firmware/target/arm/s3c2440/app.lds index a436d65770..bfd672d1a3 100644 --- a/firmware/target/arm/s3c2440/app.lds +++ b/firmware/target/arm/s3c2440/app.lds @@ -9,16 +9,10 @@ STARTUP(target/arm/s3c2440/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - #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 */ #define ENDAUDIOADDR (DRAMORIG + DRAMSIZE) diff --git a/firmware/target/arm/s5l8700/app.lds b/firmware/target/arm/s5l8700/app.lds index 7020c725e0..f055dffd79 100644 --- a/firmware/target/arm/s5l8700/app.lds +++ b/firmware/target/arm/s5l8700/app.lds @@ -10,13 +10,6 @@ STARTUP(target/arm/s5l8700/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - - #define IRAMORIG 0x0 #define DRAMORIG 0x08000000 @@ -25,7 +18,7 @@ STARTUP(target/arm/s5l8700/crt0.o) #define DRAM_SIZE (MEMORYSIZE * 0x100000) -#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE) +#define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE) #define CODECORIG (ENDAUDIOADDR) #if CONFIG_CPU==S5L8700 #define IRAMSIZE (128*1024) /* 256KB total - 128KB for core, 128KB for plugins */ diff --git a/firmware/target/arm/samsung/app.lds b/firmware/target/arm/samsung/app.lds index ec26fdbe38..de355c30b0 100644 --- a/firmware/target/arm/samsung/app.lds +++ b/firmware/target/arm/samsung/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/sandisk/app.lds b/firmware/target/arm/sandisk/app.lds index ec26fdbe38..de355c30b0 100644 --- a/firmware/target/arm/sandisk/app.lds +++ b/firmware/target/arm/sandisk/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/tatung/app.lds b/firmware/target/arm/tatung/app.lds index d7159e8e1e..cda0190809 100644 --- a/firmware/target/arm/tatung/app.lds +++ b/firmware/target/arm/tatung/app.lds @@ -9,15 +9,9 @@ STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_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 0x00000000 + STUBOFFSET +#define DRAMORIG 0x00000000 #define IRAMORIG 0x40000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/arm/tcc77x/app.lds b/firmware/target/arm/tcc77x/app.lds index c50367cb08..991b7156fe 100644 --- a/firmware/target/arm/tcc77x/app.lds +++ b/firmware/target/arm/tcc77x/app.lds @@ -7,14 +7,8 @@ STARTUP(target/arm/tcc77x/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_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 IRAMORIG 0x00000000 diff --git a/firmware/target/arm/tcc780x/app.lds b/firmware/target/arm/tcc780x/app.lds index e31e46fde7..9d5570a487 100644 --- a/firmware/target/arm/tcc780x/app.lds +++ b/firmware/target/arm/tcc780x/app.lds @@ -9,16 +9,10 @@ STARTUP(target/arm/tcc780x/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - #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 ITCMSIZE 0x1000 #define DTCMORIG 0xA0000000 diff --git a/firmware/target/arm/tms320dm320/app.lds b/firmware/target/arm/tms320dm320/app.lds index 4e23b533a9..3a9c01708a 100644 --- a/firmware/target/arm/tms320dm320/app.lds +++ b/firmware/target/arm/tms320dm320/app.lds @@ -6,12 +6,6 @@ OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) STARTUP(target/arm/tms320dm320/crt0.o) -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - #ifndef LCD_NATIVE_WIDTH #define LCD_NATIVE_WIDTH LCD_WIDTH #endif @@ -33,9 +27,9 @@ STARTUP(target/arm/tms320dm320/crt0.o) */ #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 IRAMSIZE 0x4000 diff --git a/firmware/target/arm/tms320dm320/boot.lds b/firmware/target/arm/tms320dm320/boot.lds index c4223ddb62..11fc79c24a 100644 --- a/firmware/target/arm/tms320dm320/boot.lds +++ b/firmware/target/arm/tms320dm320/boot.lds @@ -6,12 +6,6 @@ OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) STARTUP(target/arm/tms320dm320/crt0.o) -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - #ifndef LCD_NATIVE_WIDTH #define LCD_NATIVE_WIDTH LCD_WIDTH #endif @@ -35,7 +29,7 @@ STARTUP(target/arm/tms320dm320/crt0.o) #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 IRAMORIG 0x00000000 diff --git a/firmware/target/coldfire/iaudio/app.lds b/firmware/target/coldfire/iaudio/app.lds index 92009f8a41..6f3669c47e 100644 --- a/firmware/target/coldfire/iaudio/app.lds +++ b/firmware/target/coldfire/iaudio/app.lds @@ -8,15 +8,9 @@ STARTUP(target/coldfire/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif +#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE -#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE - -#define DRAMORIG 0x31000000 + STUBOFFSET +#define DRAMORIG 0x31000000 #define IRAMORIG 0x10000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/coldfire/iriver/app.lds b/firmware/target/coldfire/iriver/app.lds index d087f997c8..56ccfca509 100644 --- a/firmware/target/coldfire/iriver/app.lds +++ b/firmware/target/coldfire/iriver/app.lds @@ -8,15 +8,9 @@ STARTUP(target/coldfire/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif +#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE -#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE - -#define DRAMORIG 0x31000000 + STUBOFFSET +#define DRAMORIG 0x31000000 #define IRAMORIG 0x10000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/coldfire/mpio/app.lds b/firmware/target/coldfire/mpio/app.lds index d087f997c8..56ccfca509 100644 --- a/firmware/target/coldfire/mpio/app.lds +++ b/firmware/target/coldfire/mpio/app.lds @@ -8,15 +8,9 @@ STARTUP(target/coldfire/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif +#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE -#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE - -#define DRAMORIG 0x31000000 + STUBOFFSET +#define DRAMORIG 0x31000000 #define IRAMORIG 0x10000000 #define IRAMSIZE 0xc000 diff --git a/firmware/target/mips/ingenic_jz47xx/app.lds b/firmware/target/mips/ingenic_jz47xx/app.lds index 9b457041b6..6221a787c9 100644 --- a/firmware/target/mips/ingenic_jz47xx/app.lds +++ b/firmware/target/mips/ingenic_jz47xx/app.lds @@ -5,15 +5,8 @@ OUTPUT_ARCH(MIPS) ENTRY(_start) STARTUP(target/mips/ingenic_jz47xx/crt0.o) -#ifdef DEBUG -#define STUBOFFSET 0x10000 -#else -#define STUBOFFSET 0 -#endif - - -#define DRAMORIG 0x80004000 + STUBOFFSET -#define DRAMSIZE (MEMORYSIZE * 0x100000 - STUBOFFSET) +#define DRAMORIG 0x80004000 +#define DRAMSIZE (MEMORYSIZE * 0x100000) #define IRAMORIG 0x80000000 #define IRAMSIZE 16K -- cgit v1.2.3