Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#6554 - Move bootloader code into a common file

Attached to Project: Rockbox
Opened by Barry Wardell (barrywardell) - Saturday, 20 January 2007, 15:39 GMT+2
Last edited by Barry Wardell (barrywardell) - Saturday, 20 January 2007, 15:40 GMT+2
Task Type Patches
Category Bootloader
Status Closed
Assigned To Barry Wardell (barrywardell)
Player Type All players
Severity Low
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

There is quite a bit of common code between the bootloaders. At the moment, this code is in separate files for each target which results in code duplication.

This patch pulls all common code out to a common.c file. The functions in common.c are the result of merging the small differences between the corresponding functions in the target specific bootloader files.

Other changes made are:
* more descriptive error messages on targets other than the iPod (the error code is taken from the iPod code).
* power off after 5 seconds when there's a bootloader error on PP targets
* Load directly to DRAM_START and skip memcpy() phase on PP and iPod. This is possible since the bootloader is already copied to and running from IRAM on those targets.
* Remove unneeded #include's from main-pp.c
* Minor whitespace fixes in main-pp.c in the ata_init phase.

I have tested this on my H10 and e200 and it seems to work. It could do with testing on other targets (iPods, X5, H100, H300, are there any others affected?)
   bootloader.patch (24 KiB) 
 bootloader/main-pp.c     |  236 ++++++++---------------------------------------
 bootloader/SOURCES       |    2 
 bootloader/main.c        |  131 --------------------------
 bootloader/common.c      |  213 ++++++++++++++++++++++++++++++++++++++++++
 bootloader/ipod.c        |  209 ++---------------------------------------
 bootloader/common.h      |   39 +++++++
 firmware/export/pp5002.h |    4 
 firmware/export/pp5020.h |    2 
 8 files changed, 321 insertions(+), 515 deletions(-)

This task depends upon

Closed by  Linus Nielsen Feltzing (linusnielsen)
Thursday, 22 February 2007, 16:10 GMT+2
Reason for closing:  Accepted
Comment by Max Ried (bot47) - Saturday, 20 January 2007, 19:01 GMT+2
The loader works for my (1st Gen) iPod nano 2GB, but the size of the patched one is 947 bytes larger than the original version.
Comment by Barry Wardell (barrywardell) - Saturday, 20 January 2007, 22:54 GMT+2
The size increase was due to the dummy functions at the end of common.c being different than they were in ipod.c. I've attached an updated patch which actually results in a decrease in size by 32 bytes. The only difference from the previous one is the choice of dummy functions at the end of common.c
   bootloader_v2.patch (24 KiB) 
 bootloader/main-pp.c     |  236 ++++++++---------------------------------------
 bootloader/SOURCES       |    2 
 bootloader/main.c        |  131 --------------------------
 bootloader/common.c      |  213 ++++++++++++++++++++++++++++++++++++++++++
 bootloader/ipod.c        |  209 ++---------------------------------------
 bootloader/common.h      |   39 +++++++
 firmware/export/pp5002.h |    4 
 firmware/export/pp5020.h |    2 
 8 files changed, 321 insertions(+), 515 deletions(-)

Comment by Barry Wardell (barrywardell) - Sunday, 21 January 2007, 03:50 GMT+2
The previous patch broke building the X5, H300 and H100 bootloaders. This version should allow building for iPod, H10, e200, X5, H300 and H100. I have only tested building on iPods, X5, H300 and H100. I haven't actually tried the resulting bootloader on a device so testing on those would be welcome.

Binary size increases by about 300-500 bytes on all targets other than the iPod. This is mainly down the the addition of the verbose error messages with the function strerror().
   bootloader_v3.patch (24.3 KiB) 
 bootloader/main-pp.c     |  226 +++++++++--------------------------------------
 bootloader/SOURCES       |    2 
 bootloader/main.c        |  131 +--------------------------
 bootloader/common.c      |  205 ++++++++++++++++++++++++++++++++++++++++++
 bootloader/ipod.c        |  199 ++---------------------------------------
 bootloader/common.h      |   39 ++++++++
 firmware/export/pp5002.h |    4 
 firmware/export/pp5020.h |    2 
 8 files changed, 317 insertions(+), 491 deletions(-)

Comment by Barry Wardell (barrywardell) - Monday, 22 January 2007, 12:23 GMT+2
Updated again to work with Gigabeat and Elio bootloaders. Also fixes the fatal_error() function in iPod bootloaders.
   bootloader_v4.patch (33.1 KiB) 
 bootloader/main-pp.c     |  225 +++++++++--------------------------------------
 bootloader/SOURCES       |    2 
 bootloader/tpj1022.c     |   24 -----
 bootloader/gigabeat.c    |  139 +++++++----------------------
 bootloader/main.c        |  134 ++-------------------------
 bootloader/common.c      |  205 ++++++++++++++++++++++++++++++++++++++++++
 bootloader/ipod.c        |  201 +++--------------------------------------
 bootloader/common.h      |   34 +++++++
 firmware/export/pp5002.h |    4 
 firmware/export/pp5020.h |    2 
 10 files changed, 357 insertions(+), 613 deletions(-)

Comment by Barry Wardell (barrywardell) - Monday, 22 January 2007, 17:17 GMT+2
Updated the behaviour of the iPod bootloader:

1) If hold is on or Menu is pressed, try to load RetailOS
a) If apple_os.ipod exists try to load it.
b) If apple_os.ipod doesn't exist, but RetailOS is already at DRAM_START, load that.
2) If play is pressed, try to load iPod Linux
3) Otherwise try to load rockbox.ipod

If any of those steps fail, direct the user to reboot into disk mode.
   bootloader_v5.patch (35.8 KiB) 
 bootloader/main-pp.c     |  225 +++++++---------------------------
 bootloader/SOURCES       |    2 
 bootloader/tpj1022.c     |   24 ---
 bootloader/gigabeat.c    |  143 +++++-----------------
 bootloader/main.c        |  134 +-------------------
 bootloader/common.c      |  205 +++++++++++++++++++++++++++++++
 bootloader/ipod.c        |  305 ++++++++++-------------------------------------
 bootloader/common.h      |   34 +++++
 firmware/export/pp5002.h |    4 
 firmware/export/pp5020.h |    2 
 10 files changed, 409 insertions(+), 669 deletions(-)

Comment by Barry Wardell (barrywardell) - Friday, 26 January 2007, 13:39 GMT+2
The last patch didn't work on the Gigabeat. Hopefully this one will address that issue (hasn't been tested on-device yet though). I've also updated the Gigabeat bootloader to use the new descriptive error messages.
   bootloader_v6.patch (35.9 KiB) 
 bootloader/main-pp.c     |  225 +++++++---------------------------
 bootloader/SOURCES       |    2 
 bootloader/tpj1022.c     |   24 ---
 bootloader/gigabeat.c    |  148 ++++++----------------
 bootloader/main.c        |  134 +-------------------
 bootloader/common.c      |  205 +++++++++++++++++++++++++++++++
 bootloader/ipod.c        |  305 ++++++++++-------------------------------------
 bootloader/common.h      |   34 +++++
 firmware/export/pp5002.h |    4 
 firmware/export/pp5020.h |    2 
 10 files changed, 414 insertions(+), 669 deletions(-)

Comment by Chris (decayed.cell) - Saturday, 27 January 2007, 06:03 GMT+2
Appears to break iPod Mini 2G. Getting a stack of errors in common.c, like..

common.c:241: error: redefinition of 'reset_screen'
common.c:36: error: previous definiton of 'reset_screen' was here

Comment by Chris (decayed.cell) - Saturday, 27 January 2007, 06:06 GMT+2
Also breaks iPod Color 4G and iPod Video 5G with the same errors (happens when building bootloader, not firmware for all three devices)
Comment by Chris (decayed.cell) - Sunday, 28 January 2007, 06:10 GMT+2
Appears to be working correctly on my 5.5G Video
Comment by Barry Wardell (barrywardell) - Sunday, 28 January 2007, 19:45 GMT+2
I have committed this to SVN for iPods and other PortalPlayer devices. There were reports of the patch not working on X5 and on Gigabeat, so I left those out of the commit. Here's a patch with the bits that were left out of the commit.
   bootloader_v7.patch (13.2 KiB) 
 bootloader/SOURCES    |    4 -
 bootloader/tpj1022.c  |   24 --------
 bootloader/gigabeat.c |  148 ++++++++++++++------------------------------------
 bootloader/main.c     |  134 +++------------------------------------------
 4 files changed, 56 insertions(+), 254 deletions(-)

Comment by Linus Nielsen Feltzing (linusnielsen) - Wednesday, 21 February 2007, 21:45 GMT+2
I have made some adjustments and tested on iAudio X5. Works fine.
   bootloader_v8.patch (13.8 KiB) 
 bootloader/SOURCES    |    4 -
 bootloader/tpj1022.c  |   24 --------
 bootloader/gigabeat.c |  148 ++++++++++++++------------------------------------
 bootloader/main.c     |  148 ++++++--------------------------------------------
 bootloader/common.c   |    2 
 5 files changed, 67 insertions(+), 259 deletions(-)

Comment by Linus Nielsen Feltzing (linusnielsen) - Thursday, 22 February 2007, 13:46 GMT+2
And now I have tested it on the H100 and H300 series too without problems.

Loading...