diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-02-26 21:24:40 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-02-26 21:24:40 +0000 |
commit | 9e1d00c9fb99494ecd67cc2eb06ef0537a7f18b4 (patch) | |
tree | 3a54f016547727768484c5e9dedbf4f022b5ee12 | |
parent | b0232e040277366100910ea41994bea4c49f8db1 (diff) | |
download | rockbox-9e1d00c9fb99494ecd67cc2eb06ef0537a7f18b4.tar.gz rockbox-9e1d00c9fb99494ecd67cc2eb06ef0537a7f18b4.zip |
Get the M:Robe 500 main build booting again, fix a bug and commit the rest of Cat's work to get sound working. The code is messy right now, but it plays a file (test.raw) in a normal build when you go into the debug ports screen. Take 1.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20118 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/debug_menu.c | 3 | ||||
-rw-r--r-- | bootloader/mrobe500.c | 31 | ||||
-rw-r--r-- | firmware/export/dm320.h | 2 | ||||
-rwxr-xr-x | tools/configure | 3 |
4 files changed, 25 insertions, 14 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index e1d2d2e48f..e669a6a123 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -2655,7 +2655,8 @@ static const struct the_menu_item menuitems[] = { | |||
2655 | { "Dump ROM contents", dbg_save_roms }, | 2655 | { "Dump ROM contents", dbg_save_roms }, |
2656 | #endif | 2656 | #endif |
2657 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \ | 2657 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \ |
2658 | || CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 | 2658 | || CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 \ |
2659 | || CONFIG_CPU == DM320 | ||
2659 | { "View I/O ports", dbg_ports }, | 2660 | { "View I/O ports", dbg_ports }, |
2660 | #endif | 2661 | #endif |
2661 | #if (CONFIG_RTC == RTC_PCF50605) && !defined(SIMULATOR) | 2662 | #if (CONFIG_RTC == RTC_PCF50605) && !defined(SIMULATOR) |
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c index f92ff4bf84..e503baa01d 100644 --- a/bootloader/mrobe500.c +++ b/bootloader/mrobe500.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "time.h" | 46 | #include "time.h" |
47 | #include "system-arm.h" | 47 | #include "system-arm.h" |
48 | 48 | ||
49 | #define MRDEBUG | 49 | //#define MRDEBUG |
50 | 50 | ||
51 | #if defined(MRDEBUG) | 51 | #if defined(MRDEBUG) |
52 | 52 | ||
@@ -194,19 +194,28 @@ void main(void) | |||
194 | int rc; | 194 | int rc; |
195 | int(*kernel_entry)(void); | 195 | int(*kernel_entry)(void); |
196 | 196 | ||
197 | power_init(); | 197 | /* Make sure interrupts are disabled */ |
198 | lcd_init(); | 198 | set_irq_level(IRQ_DISABLED); |
199 | set_fiq_status(FIQ_DISABLED); | ||
199 | system_init(); | 200 | system_init(); |
200 | kernel_init(); | 201 | kernel_init(); |
201 | 202 | ||
202 | enable_irq(); | 203 | /* Now enable interrupts */ |
203 | enable_fiq(); | 204 | set_irq_level(IRQ_ENABLED); |
205 | set_fiq_status(FIQ_ENABLED); | ||
204 | 206 | ||
205 | adc_init(); | ||
206 | button_init(); | ||
207 | backlight_init(); | 207 | backlight_init(); |
208 | 208 | lcd_init(); | |
209 | font_init(); | 209 | font_init(); |
210 | button_init(); | ||
211 | usb_init(); | ||
212 | |||
213 | |||
214 | power_init(); | ||
215 | // enable_irq(); | ||
216 | // enable_fiq(); | ||
217 | |||
218 | adc_init(); | ||
210 | 219 | ||
211 | lcd_setfont(FONT_SYSFIXED); | 220 | lcd_setfont(FONT_SYSFIXED); |
212 | 221 | ||
@@ -217,8 +226,6 @@ void main(void) | |||
217 | printf("Rockbox boot loader"); | 226 | printf("Rockbox boot loader"); |
218 | printf("Version %s", APPSVERSION); | 227 | printf("Version %s", APPSVERSION); |
219 | 228 | ||
220 | usb_init(); | ||
221 | |||
222 | /* Enter USB mode without USB thread */ | 229 | /* Enter USB mode without USB thread */ |
223 | if(usb_detect() == USB_INSERTED) | 230 | if(usb_detect() == USB_INSERTED) |
224 | { | 231 | { |
@@ -244,9 +251,13 @@ void main(void) | |||
244 | reset_screen(); | 251 | reset_screen(); |
245 | lcd_update(); | 252 | lcd_update(); |
246 | } | 253 | } |
254 | |||
247 | #if defined(MRDEBUG) | 255 | #if defined(MRDEBUG) |
248 | mrdebug(); | 256 | mrdebug(); |
249 | #endif | 257 | #endif |
258 | |||
259 | sleep(50); | ||
260 | |||
250 | printf("ATA"); | 261 | printf("ATA"); |
251 | rc = storage_init(); | 262 | rc = storage_init(); |
252 | if(rc) | 263 | if(rc) |
diff --git a/firmware/export/dm320.h b/firmware/export/dm320.h index dc29f7de2d..3d932c69c1 100644 --- a/firmware/export/dm320.h +++ b/firmware/export/dm320.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #define LCD_BUFFER_SIZE (LCD_WIDTH*LCD_HEIGHT*2) | 30 | #define LCD_BUFFER_SIZE (LCD_WIDTH*LCD_HEIGHT*2) |
31 | #define TTB_SIZE (0x4000) | 31 | #define TTB_SIZE (0x4000) |
32 | /* must be 16Kb (0x4000) aligned */ | 32 | /* must be 16Kb (0x4000) aligned */ |
33 | #if 0 | 33 | #if 1 |
34 | #define MEM_END 0x00900000 + (MEM*0x00100000) | 34 | #define MEM_END 0x00900000 + (MEM*0x00100000) |
35 | #define TTB_BASE_ADDR (MEM_END - TTB_SIZE) | 35 | #define TTB_BASE_ADDR (MEM_END - TTB_SIZE) |
36 | #else | 36 | #else |
diff --git a/tools/configure b/tools/configure index 2b56514435..aa46beca5d 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1434,8 +1434,7 @@ fi | |||
1434 | target="-DMROBE_500" | 1434 | target="-DMROBE_500" |
1435 | memory=64 # always | 1435 | memory=64 # always |
1436 | arm926ejscc | 1436 | arm926ejscc |
1437 | # tool="$rootdir/tools/scramble -add=m500" | 1437 | tool="$rootdir/tools/scramble -add=m500" |
1438 | tool="cp " | ||
1439 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1438 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
1440 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1439 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1441 | output="rockbox.mrobe500" | 1440 | output="rockbox.mrobe500" |