summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2008-04-22 04:34:25 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2008-04-22 04:34:25 +0000
commit7510335fc4fe25e1fe8ec80a33bd3f3f7442dd4c (patch)
tree4b542498d76a9550c9602b31eebae7fe8debda12 /bootloader
parent68afa9dc3438a03705544745654cd7f4d53d72c0 (diff)
downloadrockbox-7510335fc4fe25e1fe8ec80a33bd3f3f7442dd4c.tar.gz
rockbox-7510335fc4fe25e1fe8ec80a33bd3f3f7442dd4c.tar.bz2
rockbox-7510335fc4fe25e1fe8ec80a33bd3f3f7442dd4c.zip
This is a big chunk of code necessary to prepare for Gigabeat F flash loading and and implementation of rolo. There should be no noticible changes for the user. A new bootloader is not needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17213 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/gigabeat.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index 8860b42c43..ac560afd64 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -54,7 +54,6 @@ void main(void)
int rc;
int(*kernel_entry)(void);
- memory_init();
power_init();
system_init();
lcd_init();
@@ -98,6 +97,8 @@ void main(void)
printf("Rockbox boot loader");
printf("Version %s", version);
+ sleep(50); /* ATA seems to error without this pause */
+
rc = ata_init();
if(rc)
{
@@ -115,8 +116,8 @@ void main(void)
printf("Loading firmware");
- loadbuffer = (unsigned char*) 0x100;
- buffer_size = (unsigned char*)0x400000 - loadbuffer;
+ loadbuffer = (unsigned char*) 0x31000000;
+ buffer_size = (unsigned char*)0x31400000 - loadbuffer;
rc = load_firmware(loadbuffer, BOOTFILE, buffer_size);
if(rc < 0)