summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorTomasz Moń <desowin@gmail.com>2021-07-08 18:23:18 +0200
committerTomasz Moń <desowin@gmail.com>2021-07-09 09:24:38 +0000
commit60e2cd6de946c0c473c0e9bfde5b7b1d47a5b28f (patch)
tree07ebe2764bc37a0189da55a62312524769a5ecab /firmware/target/arm
parent2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d (diff)
downloadrockbox-60e2cd6de946c0c473c0e9bfde5b7b1d47a5b28f.tar.gz
rockbox-60e2cd6de946c0c473c0e9bfde5b7b1d47a5b28f.zip
DM320: Regorganize LCD and TTB memory layout
Do not introduce any change for M:Robe 500 as it uses the two LCD frames in non-obvious way. Sansa Connect and Creative ZVM use only single front framebuffer. Place TTB at DRAM end to minimize memory loss due to alignment. Reserve as little as possible memory for the LCD frames. On Sansa Connect this change extends audio buffer by 858 KiB. Change-Id: I21bdeec4cfba86d71803a39acd651a87e73767e6
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/tms320dm320/app.lds60
-rw-r--r--firmware/target/arm/tms320dm320/boot.lds60
2 files changed, 80 insertions, 40 deletions
diff --git a/firmware/target/arm/tms320dm320/app.lds b/firmware/target/arm/tms320dm320/app.lds
index 6ceb512d21..b35ace1ce6 100644
--- a/firmware/target/arm/tms320dm320/app.lds
+++ b/firmware/target/arm/tms320dm320/app.lds
@@ -14,22 +14,29 @@ STARTUP(target/arm/tms320dm320/crt0.o)
#define LCD_NATIVE_HEIGHT LCD_HEIGHT
#endif
-#define LCD_FUDGE LCD_NATIVE_WIDTH%32
-
-#define LCD_BUFFER_SIZE ((LCD_NATIVE_WIDTH+LCD_FUDGE)*LCD_NATIVE_HEIGHT*2)
-
/* must be 16Kb (0x4000) aligned */
#define TTB_SIZE 0x4000
+#define DRAMSIZE (MEMORYSIZE * 0x100000)
+#define DRAMORIG CONFIG_SDRAM_START
+
+
+#ifdef MROBE_500
+#define LCD_FUDGE LCD_NATIVE_WIDTH%32
+#define LCD_BUFFER_SIZE ((LCD_NATIVE_WIDTH+LCD_FUDGE)*LCD_NATIVE_HEIGHT*2)
/* Give this some memory to allow it to align to the MMU boundary.
* Note that since there are two buffers (YUV/RGB) it calculates the approximate
* memory needed in steps of 1 Meg.
*/
-#define LCD_TTB_AREA 0x100000*((LCD_BUFFER_SIZE>>19)+1)
-
-#define DRAMSIZE (MEMORYSIZE * 0x100000)
+#define LCD_TTB_AREA (0x100000*((LCD_BUFFER_SIZE>>19)+1))
+#else
+#define LCD_BUFFER_SIZE (LCD_NATIVE_WIDTH*LCD_NATIVE_HEIGHT*2)
+#define LCD_TTB_AREA (TTB_SIZE + LCD_BUFFER_SIZE)
+#endif
-#define DRAMORIG CONFIG_SDRAM_START
+/* End of the audio buffer, where the codec buffer starts */
+#define ENDAUDIOADDR \
+ (DRAMORIG + DRAMSIZE - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_TTB_AREA)
#define FLASHORIG 0x00100000
#define FLASHSIZE 0x00800000
@@ -44,10 +51,6 @@ PRO_STACK_SIZE = 0x2000;
IRQ_STACK_SIZE = 0x600;
FIQ_STACK_SIZE = 0x400;
-/* End of the audio buffer, where the codec buffer starts */
-#define ENDAUDIOADDR \
- (DRAMORIG + DRAMSIZE - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_TTB_AREA)
-
MEMORY
{
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
@@ -105,7 +108,7 @@ SECTIONS
*(.rodata*)
} > DRAM
- .data :
+ .data :
{
. = ALIGN(0x4);
*(.data*)
@@ -142,12 +145,12 @@ SECTIONS
} > ITCM
/* Program stack space */
- .pro_stack (NOLOAD):
+ .pro_stack (NOLOAD):
{
. = ALIGN(0x4);
*(.stack)
stackbegin = .; /* Variable for thread.c */
- _pro_stack_end = .;
+ _pro_stack_end = .;
. += PRO_STACK_SIZE;
_pro_stack_start = .;
stackend = .; /* Variable for tread.c */
@@ -193,31 +196,48 @@ SECTIONS
pluginbuf = .;
. += PLUGIN_BUFFER_SIZE;
} > DRAM
-
+
_endsdram = .;
+#ifdef MROBE_500
.ttbtable (NOLOAD) :
{
. = ALIGN (0x4000);
_ttbstart = .;
. += TTB_SIZE;
} > DRAM
-
+
/* The LCD buffer should be at the end of memory to protect against
- * overflowing something else when the YUV blitter is fudging the screen
+ * overflowing something else when the YUV blitter is fudging the screen
* size.
*/
-
+
.lcdbuffer (NOLOAD) :
{
_lcdbuf = .;
. += LCD_BUFFER_SIZE;
} > DRAM
-
+
.lcdbuffer2 (NOLOAD) :
{
_lcdbuf2 = .;
. += LCD_BUFFER_SIZE;
} > DRAM
+#else
+ .lcdbuffer (NOLOAD) :
+ {
+ . = ALIGN(32);
+ _lcdbuf = .;
+ . += LCD_BUFFER_SIZE;
+ } > DRAM
+
+ /* Place TTB at the end of RAM to minimize alignment losses */
+ .ttbtable (NOLOAD) :
+ {
+ . = ALIGN (0x4000);
+ _ttbstart = .;
+ . += TTB_SIZE;
+ } > DRAM
+#endif
}
diff --git a/firmware/target/arm/tms320dm320/boot.lds b/firmware/target/arm/tms320dm320/boot.lds
index 2db687d533..8b075f43df 100644
--- a/firmware/target/arm/tms320dm320/boot.lds
+++ b/firmware/target/arm/tms320dm320/boot.lds
@@ -14,22 +14,28 @@ STARTUP(target/arm/tms320dm320/crt0.o)
#define LCD_NATIVE_HEIGHT LCD_HEIGHT
#endif
-#define LCD_FUDGE LCD_NATIVE_WIDTH%32
-
-#define LCD_BUFFER_SIZE ((LCD_NATIVE_WIDTH+LCD_FUDGE)*LCD_NATIVE_HEIGHT*2)
-
/* must be 16Kb (0x4000) aligned */
#define TTB_SIZE (0x4000)
+/* Bootloader only uses/knows about the upper 32 M */
+#define DRAMSIZE (MEMORYSIZE * 0x100000 / 2)
+#define DRAMORIG CONFIG_SDRAM_START+DRAMSIZE
+
+#ifdef MROBE_500
+#define LCD_FUDGE LCD_NATIVE_WIDTH%32
+#define LCD_BUFFER_SIZE ((LCD_NATIVE_WIDTH+LCD_FUDGE)*LCD_NATIVE_HEIGHT*2)
/* Give this some memory to allow it to align to the MMU boundary.
* Note that since there are two buffers (YUV/RGB) it calculates the approximate
* memory needed in steps of 1 Meg.
*/
-#define LCD_TTB_AREA 0x100000*((LCD_BUFFER_SIZE>>19)+1)
-
-/* Bootloader only uses/knows about the upper 32 M */
-#define DRAMORIG CONFIG_SDRAM_START+0x02000000
-#define DRAMSIZE (MEMORYSIZE * 0x80000)
+#define LCD_TTB_AREA (0x100000*((LCD_BUFFER_SIZE>>19)+1))
+/* End of the audio buffer, where the codec buffer starts */
+#define TTB_BEGIN (DRAMORIG + DRAMSIZE - LCD_TTB_AREA)
+#else
+#define LCD_BUFFER_SIZE (LCD_NATIVE_WIDTH*LCD_NATIVE_HEIGHT*2)
+#define LCD_TTB_AREA (TTB_SIZE + LCD_BUFFER_SIZE)
+#define LCD_BEGIN (DRAMORIG + DRAMSIZE - LCD_TTB_AREA)
+#endif
#define IRAMORIG 0x00000000
#define IRAMSIZE 0x4000
@@ -59,9 +65,6 @@ PRO_STACK_SIZE = 0x2000;
IRQ_STACK_SIZE = 0x400;
FIQ_STACK_SIZE = 0x400;
-/* End of the audio buffer, where the codec buffer starts */
-#define TTB_BEGIN (DRAMORIG + DRAMSIZE - LCD_TTB_AREA)
-
MEMORY
{
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
@@ -148,7 +151,7 @@ SECTIONS
} > IRAM AT> FLASH
_iramcopy = LOADADDR(.iram);
-
+
.ibss (NOLOAD) :
{
. = ALIGN(0x4);
@@ -158,12 +161,12 @@ SECTIONS
} > IRAM
/* Program stack space */
- .pro_stack (NOLOAD):
+ .pro_stack (NOLOAD):
{
. = ALIGN(0x4);
*(.stack)
stackbegin = .; /* Variable for thread.c */
- _pro_stack_end = .;
+ _pro_stack_end = .;
. += PRO_STACK_SIZE;
_pro_stack_start = .;
stackend = .; /* Variable for tread.c */
@@ -186,28 +189,45 @@ SECTIONS
. += FIQ_STACK_SIZE;
_fiq_stack_start = .;
} > IRAM
-
+
+#ifdef MROBE_500
.ttbtable TTB_BEGIN (NOLOAD) :
{
. = ALIGN (0x4000);
_ttbstart = .;
. += TTB_SIZE;
} > DRAM
-
+
/* The LCD buffer should be at the end of memory to protect against
- * overflowing something else when the YUV blitter is fudging the screen
+ * overflowing something else when the YUV blitter is fudging the screen
* size.
*/
-
+
.lcdbuffer (NOLOAD) :
{
_lcdbuf = .;
. += LCD_BUFFER_SIZE;
} > DRAM
-
+
.lcdbuffer2 (NOLOAD) :
{
_lcdbuf2 = .;
. += LCD_BUFFER_SIZE;
} > DRAM
+#else
+ .lcdbuffer LCD_BEGIN (NOLOAD) :
+ {
+ . = ALIGN(32);
+ _lcdbuf = .;
+ . += LCD_BUFFER_SIZE;
+ } > DRAM
+
+ /* Place TTB at the end of RAM to minimize alignment losses */
+ .ttbtable (NOLOAD) :
+ {
+ . = ALIGN (0x4000);
+ _ttbstart = .;
+ . += TTB_SIZE;
+ } > DRAM
+#endif
}