diff options
-rw-r--r-- | apps/plugins/SOURCES | 11 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/doom.make | 2 | ||||
-rw-r--r-- | apps/plugins/plugin.lds | 4 | ||||
-rw-r--r-- | firmware/panic.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/app.lds | 4 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/crt0.S | 96 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | 2 |
8 files changed, 56 insertions, 67 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 34940b4ee4..da906e6967 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -179,14 +179,3 @@ md5sum.c | |||
179 | #ifdef USB_ENABLE_HID | 179 | #ifdef USB_ENABLE_HID |
180 | remote_control.c | 180 | remote_control.c |
181 | #endif | 181 | #endif |
182 | |||
183 | test_codec.c | ||
184 | test_core_jpeg.c | ||
185 | test_disk.c | ||
186 | test_fps.c | ||
187 | test_gfx.c | ||
188 | test_mem_jpeg.c | ||
189 | test_resize.c | ||
190 | test_sampr.c | ||
191 | test_scanrate.c | ||
192 | test_viewports.c | ||
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 6eda335bc7..e4e399ff7b 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -30,7 +30,7 @@ PLUGIN_HEADER | |||
30 | #define EV_EXIT 1337 | 30 | #define EV_EXIT 1337 |
31 | 31 | ||
32 | /* seems to work with 1300, but who knows... */ | 32 | /* seems to work with 1300, but who knows... */ |
33 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x1200 | 33 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 |
34 | 34 | ||
35 | #if CONFIG_KEYPAD == RECORDER_PAD | 35 | #if CONFIG_KEYPAD == RECORDER_PAD |
36 | 36 | ||
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index af302fa5bb..bdc32230eb 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make | |||
@@ -10,7 +10,7 @@ | |||
10 | DOOMSRCDIR := $(APPSDIR)/plugins/doom | 10 | DOOMSRCDIR := $(APPSDIR)/plugins/doom |
11 | DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom | 11 | DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom |
12 | 12 | ||
13 | #ROCKS += $(DOOMBUILDDIR)/doom.rock | 13 | ROCKS += $(DOOMBUILDDIR)/doom.rock |
14 | 14 | ||
15 | DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) | 15 | DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) |
16 | DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c | 16 | DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c |
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index 436f8b4447..fe38b646d9 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds | |||
@@ -142,8 +142,8 @@ OUTPUT_FORMAT(elf32-littlemips) | |||
142 | 142 | ||
143 | #elif CONFIG_CPU==S5L8700 | 143 | #elif CONFIG_CPU==S5L8700 |
144 | #define DRAMORIG 0x08000000 | 144 | #define DRAMORIG 0x08000000 |
145 | #define IRAMORIG (0x00000000 + (128*1024)) | 145 | #define IRAMORIG (0x00000000 + (64*1024)) |
146 | #define IRAMSIZE (128*1024) | 146 | #define IRAMSIZE (64*1024) |
147 | 147 | ||
148 | #elif CONFIG_CPU==S5L8701 | 148 | #elif CONFIG_CPU==S5L8701 |
149 | #define DRAMORIG 0x08000000 | 149 | #define DRAMORIG 0x08000000 |
diff --git a/firmware/panic.c b/firmware/panic.c index 36eec67f12..9230337ba4 100644 --- a/firmware/panic.c +++ b/firmware/panic.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "system.h" | 32 | #include "system.h" |
33 | 33 | ||
34 | static char panic_buf[128]; | 34 | static char panic_buf[128]; |
35 | #define LINECHARS (LCD_WIDTH/SYSFONT_WIDTH) - 2 | 35 | #define LINECHARS (LCD_WIDTH/SYSFONT_WIDTH) |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * "Dude. This is pretty fucked-up, right here." | 38 | * "Dude. This is pretty fucked-up, right here." |
diff --git a/firmware/target/arm/s5l8700/app.lds b/firmware/target/arm/s5l8700/app.lds index ed47ad5643..e431ee1fd7 100644 --- a/firmware/target/arm/s5l8700/app.lds +++ b/firmware/target/arm/s5l8700/app.lds | |||
@@ -28,7 +28,7 @@ STARTUP(target/arm/s5l8700/crt0.o) | |||
28 | #define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE) | 28 | #define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE) |
29 | #define CODECORIG (ENDAUDIOADDR) | 29 | #define CODECORIG (ENDAUDIOADDR) |
30 | #if CONFIG_CPU==S5L8700 | 30 | #if CONFIG_CPU==S5L8700 |
31 | #define IRAMSIZE (128*1024) /* 256KB total - 128KB for core, 128KB for plugins */ | 31 | #define IRAMSIZE (64*1024) /* 128KB total - 64KB for core, 64KB for plugins */ |
32 | #else /* S5L8701 */ | 32 | #else /* S5L8701 */ |
33 | #define IRAMSIZE (96*1024) /* 176KB total - 96KB for core, 80KB for plugins */ | 33 | #define IRAMSIZE (96*1024) /* 176KB total - 96KB for core, 80KB for plugins */ |
34 | #endif | 34 | #endif |
@@ -108,7 +108,7 @@ SECTIONS | |||
108 | stackbegin = .; | 108 | stackbegin = .; |
109 | _stackbegin = .; | 109 | _stackbegin = .; |
110 | #ifdef IPOD_NANO2G | 110 | #ifdef IPOD_NANO2G |
111 | . += 0x2000; | 111 | . += 0x4000; |
112 | #endif | 112 | #endif |
113 | . += 0x2000; | 113 | . += 0x2000; |
114 | stackend = .; | 114 | stackend = .; |
diff --git a/firmware/target/arm/s5l8700/crt0.S b/firmware/target/arm/s5l8700/crt0.S index fe2a2c1980..bb6d910e22 100644 --- a/firmware/target/arm/s5l8700/crt0.S +++ b/firmware/target/arm/s5l8700/crt0.S | |||
@@ -260,64 +260,64 @@ start_loc: | |||
260 | 260 | ||
261 | #if defined(MEIZU_M6SP) || defined(MEIZU_M3) | 261 | #if defined(MEIZU_M6SP) || defined(MEIZU_M3) |
262 | /* setup SDRAM for Meizu M6SP */ | 262 | /* setup SDRAM for Meizu M6SP */ |
263 | ldr r1, =0x38200000 | 263 | ldr r1, =0x38200000 |
264 | // configure SDR drive strength and pad settings | 264 | // configure SDR drive strength and pad settings |
265 | mov r0, #SDR_DSS_SEL_B | 265 | mov r0, #SDR_DSS_SEL_B |
266 | str r0, [r1, #0x4C] // MIU_DSS_SEL_B | 266 | str r0, [r1, #0x4C] // MIU_DSS_SEL_B |
267 | mov r0, #SDR_DSS_SEL_O | 267 | mov r0, #SDR_DSS_SEL_O |
268 | str r0, [r1, #0x50] // MIU_DSS_SEL_O | 268 | str r0, [r1, #0x50] // MIU_DSS_SEL_O |
269 | mov r0, #SDR_DSS_SEL_C | 269 | mov r0, #SDR_DSS_SEL_C |
270 | str r0, [r1, #0x54] // MIU_DSS_SEL_C | 270 | str r0, [r1, #0x54] // MIU_DSS_SEL_C |
271 | mov r0, #2 | 271 | mov r0, #2 |
272 | str r0, [r1, #0x60] // SSTL2_PAD_ON | 272 | str r0, [r1, #0x60] // SSTL2_PAD_ON |
273 | // select SDR mode | 273 | // select SDR mode |
274 | ldr r0, [r1, #0x40] | 274 | ldr r0, [r1, #0x40] |
275 | mov r2, #0xFFFDFFFF | 275 | mov r2, #0xFFFDFFFF |
276 | and r0, r0, r2 | 276 | and r0, r0, r2 |
277 | orr r0, r0, #1 | 277 | orr r0, r0, #1 |
278 | str r0, [r1, #0x40] // MIUORG | 278 | str r0, [r1, #0x40] // MIUORG |
279 | // set controller configuration | 279 | // set controller configuration |
280 | mov r0, #SDR_CONFIG | 280 | mov r0, #SDR_CONFIG |
281 | str r0, [r1] // MIUCON | 281 | str r0, [r1] // MIUCON |
282 | // set SDRAM timing | 282 | // set SDRAM timing |
283 | ldr r0, =SDR_TIMING | 283 | ldr r0, =SDR_TIMING |
284 | str r0, [r1, #0x10] // MIUSDPARA | 284 | str r0, [r1, #0x10] // MIUSDPARA |
285 | // set refresh rate | 285 | // set refresh rate |
286 | mov r0, #0x1080 | 286 | mov r0, #0x1080 |
287 | str r0, [r1, #0x08] // MIUAREF | 287 | str r0, [r1, #0x08] // MIUAREF |
288 | // initialise SDRAM | 288 | // initialise SDRAM |
289 | mov r0, #0x003 | 289 | mov r0, #0x003 |
290 | str r0, [r1, #0x04] // MIUCOM = nop | 290 | str r0, [r1, #0x04] // MIUCOM = nop |
291 | ldr r0, =0x203 | 291 | ldr r0, =0x203 |
292 | str r0, [r1, #0x04] // MIUCOM = precharge all banks | 292 | str r0, [r1, #0x04] // MIUCOM = precharge all banks |
293 | nop | 293 | nop |
294 | nop | 294 | nop |
295 | nop | 295 | nop |
296 | ldr r0, =0x303 | 296 | ldr r0, =0x303 |
297 | str r0, [r1, #0x04] // MIUCOM = auto-refresh | 297 | str r0, [r1, #0x04] // MIUCOM = auto-refresh |
298 | nop | 298 | nop |
299 | nop | 299 | nop |
300 | nop | 300 | nop |
301 | nop | 301 | nop |
302 | str r0, [r1, #0x04] // MIUCOM = auto-refresh | 302 | str r0, [r1, #0x04] // MIUCOM = auto-refresh |
303 | nop | 303 | nop |
304 | nop | 304 | nop |
305 | nop | 305 | nop |
306 | nop | 306 | nop |
307 | str r0, [r1, #0x04] // MIUCOM = auto-refresh | 307 | str r0, [r1, #0x04] // MIUCOM = auto-refresh |
308 | nop | 308 | nop |
309 | nop | 309 | nop |
310 | nop | 310 | nop |
311 | nop | 311 | nop |
312 | // set mode register | 312 | // set mode register |
313 | mov r0, #SDR_MRS | 313 | mov r0, #SDR_MRS |
314 | str r0, [r1, #0x0C] // MIUMRS | 314 | str r0, [r1, #0x0C] // MIUMRS |
315 | ldr r0, =0x103 | 315 | ldr r0, =0x103 |
316 | str r0, [r1, #0x04] // MIUCOM = mode register set | 316 | str r0, [r1, #0x04] // MIUCOM = mode register set |
317 | ldr r0, =SDR_EMRS | 317 | ldr r0, =SDR_EMRS |
318 | str r0, [r1, #0x0C] // MIUMRS | 318 | str r0, [r1, #0x0C] // MIUMRS |
319 | ldr r0, =0x103 | 319 | ldr r0, =0x103 |
320 | str r0, [r1, #0x04] // MIUCOM = mode register set | 320 | str r0, [r1, #0x04] // MIUCOM = mode register set |
321 | #endif /* MEIZU_M6SP */ | 321 | #endif /* MEIZU_M6SP */ |
322 | 322 | ||
323 | mov r1, #0x1 | 323 | mov r1, #0x1 |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c index 0626a91514..419c71a867 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | |||
@@ -48,7 +48,7 @@ void power_off(void) | |||
48 | 48 | ||
49 | void power_init(void) | 49 | void power_init(void) |
50 | { | 50 | { |
51 | pmu_write(0x1e, 15); /* Vcore = 1.000V */ | 51 | /* TODO */ |
52 | } | 52 | } |
53 | 53 | ||
54 | #if CONFIG_CHARGING | 54 | #if CONFIG_CHARGING |