diff options
-rw-r--r-- | firmware/export/config-mrobe500.h | 16 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/app.lds | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/system-dm320.c | 8 |
3 files changed, 19 insertions, 7 deletions
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index 80961c93c1..ab5e37d20b 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -68,7 +68,17 @@ | |||
68 | /* LCD dimensions */ | 68 | /* LCD dimensions */ |
69 | #define CONFIG_LCD LCD_MROBE500 | 69 | #define CONFIG_LCD LCD_MROBE500 |
70 | 70 | ||
71 | #if 0 | 71 | /* These defines are used internal to this header */ |
72 | #define _LCD_RES_QVGA 1 | ||
73 | #define _LCD_RES_VGA 2 | ||
74 | #define _LCD_PORTRAIT 1 | ||
75 | #define _LCD_LANDSCAPE 2 | ||
76 | |||
77 | /* Setup the resolution and orientation */ | ||
78 | #define _RESOLUTION _LCD_RES_VGA | ||
79 | #define _ORIENTATION _LCD_LANDSCAPE | ||
80 | |||
81 | #if _RESOLUTION == _LCD_RES_VGA | ||
72 | #define LCD_NATIVE_WIDTH 480 | 82 | #define LCD_NATIVE_WIDTH 480 |
73 | #define LCD_NATIVE_HEIGHT 640 | 83 | #define LCD_NATIVE_HEIGHT 640 |
74 | #else | 84 | #else |
@@ -77,7 +87,7 @@ | |||
77 | #endif | 87 | #endif |
78 | 88 | ||
79 | /* choose the lcd orientation. CONFIG_ORIENTATION defined in config.h */ | 89 | /* choose the lcd orientation. CONFIG_ORIENTATION defined in config.h */ |
80 | #if 0 | 90 | #if _ORIENTATION == _LCD_PORTRAIT |
81 | /* This is the Portrait setup */ | 91 | /* This is the Portrait setup */ |
82 | #define LCD_WIDTH LCD_NATIVE_WIDTH | 92 | #define LCD_WIDTH LCD_NATIVE_WIDTH |
83 | #define LCD_HEIGHT LCD_NATIVE_HEIGHT | 93 | #define LCD_HEIGHT LCD_NATIVE_HEIGHT |
@@ -183,7 +193,7 @@ | |||
183 | /* Define this if you have a Texas Instruments TSC2100 touch screen */ | 193 | /* Define this if you have a Texas Instruments TSC2100 touch screen */ |
184 | #define HAVE_TSC2100 | 194 | #define HAVE_TSC2100 |
185 | 195 | ||
186 | #ifndef SIMULATOR | 196 | #if !defined(SIMULATOR) |
187 | 197 | ||
188 | /* M66591 register base */ | 198 | /* M66591 register base */ |
189 | #define M66591_BASE 0x60000000 | 199 | #define M66591_BASE 0x60000000 |
diff --git a/firmware/target/arm/tms320dm320/app.lds b/firmware/target/arm/tms320dm320/app.lds index 2c74278142..fbaaff3e6c 100644 --- a/firmware/target/arm/tms320dm320/app.lds +++ b/firmware/target/arm/tms320dm320/app.lds | |||
@@ -65,8 +65,6 @@ SECTIONS | |||
65 | { | 65 | { |
66 | *(.rodata) /* problems without this, dunno why */ | 66 | *(.rodata) /* problems without this, dunno why */ |
67 | *(.rodata*) | 67 | *(.rodata*) |
68 | *(.rodata.str1.1) | ||
69 | *(.rodata.str1.4) | ||
70 | . = ALIGN(0x4); | 68 | . = ALIGN(0x4); |
71 | } > DRAM | 69 | } > DRAM |
72 | 70 | ||
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c index 7f40831646..461028a349 100644 --- a/firmware/target/arm/tms320dm320/system-dm320.c +++ b/firmware/target/arm/tms320dm320/system-dm320.c | |||
@@ -272,7 +272,11 @@ void system_init(void) | |||
272 | #ifdef CREATIVE_ZVx | 272 | #ifdef CREATIVE_ZVx |
273 | dma_init(); | 273 | dma_init(); |
274 | #endif | 274 | #endif |
275 | 275 | ||
276 | #define LCD_FUDGE LCD_NATIVE_WIDTH%32 | ||
277 | #define LCD_BUFFER_SIZE ((LCD_NATIVE_WIDTH+LCD_FUDGE)*LCD_NATIVE_HEIGHT*2) | ||
278 | #define LCD_TTB_AREA ((LCD_BUFFER_SIZE>>19)+1) | ||
279 | |||
276 | /* MMU initialization (Starts data and instruction cache) */ | 280 | /* MMU initialization (Starts data and instruction cache) */ |
277 | ttb_init(); | 281 | ttb_init(); |
278 | /* Make sure everything is mapped on itself */ | 282 | /* Make sure everything is mapped on itself */ |
@@ -280,7 +284,7 @@ void system_init(void) | |||
280 | /* Enable caching for RAM */ | 284 | /* Enable caching for RAM */ |
281 | map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEM, CACHE_ALL); | 285 | map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEM, CACHE_ALL); |
282 | /* enable buffered writing for the framebuffer */ | 286 | /* enable buffered writing for the framebuffer */ |
283 | map_section((int)FRAME, (int)FRAME, 1, BUFFERED); | 287 | map_section((int)FRAME, (int)FRAME, LCD_TTB_AREA, BUFFERED); |
284 | #ifdef CREATIVE_ZVx | 288 | #ifdef CREATIVE_ZVx |
285 | /* mimic OF */ | 289 | /* mimic OF */ |
286 | map_section(0x00100000, 0x00100000, 4, CACHE_NONE); | 290 | map_section(0x00100000, 0x00100000, 4, CACHE_NONE); |