summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2012-03-04 15:34:29 +0100
committerMarcin Bukat <marcin.bukat@gmail.com>2013-06-27 13:50:11 +0200
commit0b29691324e5700f15ea653592bf29f8552d47d7 (patch)
tree00e4f77f28c813a493cd8af22170f486f6e82903 /bootloader
parent46ea8bfe7c690c8db230fff3a582a69779f8e432 (diff)
downloadrockbox-0b29691324e5700f15ea653592bf29f8552d47d7.tar.gz
rockbox-0b29691324e5700f15ea653592bf29f8552d47d7.tar.bz2
rockbox-0b29691324e5700f15ea653592bf29f8552d47d7.zip
Move load_firmware() to separate file
The idea is to share loading code between bootloaders and rolo(). Change-Id: I1656ed91946d7a05cb7c9fa7a16793c3c862a5cd Reviewed-on: http://gerrit.rockbox.org/190 Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/common.c105
-rw-r--r--bootloader/common.h12
-rw-r--r--bootloader/creativezvm.c15
-rw-r--r--bootloader/gigabeat-s.c11
-rw-r--r--bootloader/gigabeat.c13
-rw-r--r--bootloader/iaudio_coldfire.c34
-rw-r--r--bootloader/imx233.c4
-rw-r--r--bootloader/ipod.c16
-rw-r--r--bootloader/ipodnano2g.c6
-rw-r--r--bootloader/iriver_h1x0.c6
-rw-r--r--bootloader/iriver_h300.c8
-rw-r--r--bootloader/main-pp.c274
-rw-r--r--bootloader/mini2440.c17
-rw-r--r--bootloader/mpio_hd200_hd300.c26
-rw-r--r--bootloader/mrobe500.c14
-rw-r--r--bootloader/ondavx747.c8
-rw-r--r--bootloader/rk27xx.c10
-rw-r--r--bootloader/sansa_as3525.c4
-rw-r--r--bootloader/sansaconnect.c5
-rw-r--r--bootloader/telechips.c6
20 files changed, 124 insertions, 470 deletions
diff --git a/bootloader/common.c b/bootloader/common.c
index 207d74ae9c..21b26e881c 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -35,6 +35,14 @@
#include "string.h"
#include "usb.h"
#include "file.h"
+#include "loader_strerror.h"
+#if defined(MI4_FORMAT)
+#include "mi4-loader.h"
+#elif defined(RKW_FORMAT)
+#include "rkw-loader.h"
+#else
+#include "rb-loader.h"
+#endif
/* TODO: Other bootloaders need to be adjusted to set this variable to true
on a button press - currently only the ipod, H10, Vibe 500 and Sansa versions do. */
@@ -94,31 +102,6 @@ int printf(const char *format, ...)
return len;
}
-char *strerror(int error)
-{
- switch(error)
- {
- case EOK:
- return "OK";
- case EFILE_NOT_FOUND:
- return "File not found";
- case EREAD_CHKSUM_FAILED:
- return "Read failed (chksum)";
- case EREAD_MODEL_FAILED:
- return "Read failed (model)";
- case EREAD_IMAGE_FAILED:
- return "Read failed (image)";
- case EBAD_CHKSUM:
- return "Bad checksum";
- case EFILE_TOO_BIG:
- return "File too big";
- case EINVALID_FORMAT:
- return "Invalid file format";
- default:
- return "Unknown";
- }
-}
-
void error(int errortype, int error, bool shutdown)
{
switch(errortype)
@@ -132,85 +115,17 @@ void error(int errortype, int error, bool shutdown)
break;
case EBOOTFILE:
- printf(strerror(error));
+ printf(loader_strerror(error));
break;
}
lcd_update();
sleep(5*HZ);
+
if(shutdown)
power_off();
}
-/* Load firmware image in a format created by tools/scramble */
-int load_firmware(unsigned char* buf, char* firmware, int buffer_size)
-{
- int fd;
- int rc;
- int len;
- unsigned long chksum;
- char model[5];
- unsigned long sum;
- int i;
- char filename[MAX_PATH];
-
- snprintf(filename,sizeof(filename), BOOTDIR "/%s",firmware);
- fd = open(filename, O_RDONLY);
- if(fd < 0)
- {
- snprintf(filename,sizeof(filename),"/%s",firmware);
- fd = open(filename, O_RDONLY);
- if(fd < 0)
- return EFILE_NOT_FOUND;
- }
-
- len = filesize(fd) - 8;
-
- printf("Length: %x", len);
-
- if (len > buffer_size)
- return EFILE_TOO_BIG;
-
- lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET);
-
- rc = read(fd, &chksum, 4);
- chksum=betoh32(chksum); /* Rockbox checksums are big-endian */
- if(rc < 4)
- return EREAD_CHKSUM_FAILED;
-
- printf("Checksum: %x", chksum);
-
- rc = read(fd, model, 4);
- if(rc < 4)
- return EREAD_MODEL_FAILED;
-
- model[4] = '\0';
-
- printf("Model name: %s", model);
- printf("Loading %s", firmware);
-
- lseek(fd, FIRMWARE_OFFSET_FILE_DATA, SEEK_SET);
-
- rc = read(fd, buf, len);
- if(rc < len)
- return EREAD_IMAGE_FAILED;
-
- close(fd);
-
- sum = MODEL_NUMBER;
-
- for(i = 0;i < len;i++) {
- sum += buf[i];
- }
-
- printf("Sum: %x", sum);
-
- if(sum != chksum)
- return EBAD_CHKSUM;
-
- return EOK;
-}
-
/* Load raw binary image. */
int load_raw_firmware(unsigned char* buf, char* firmware, int buffer_size)
{
diff --git a/bootloader/common.h b/bootloader/common.h
index 7d5425c9c8..d09ff1a5ab 100644
--- a/bootloader/common.h
+++ b/bootloader/common.h
@@ -21,16 +21,6 @@
#include <stdbool.h>
-/* Error codes */
-#define EOK 0
-#define EFILE_NOT_FOUND -1
-#define EREAD_CHKSUM_FAILED -2
-#define EREAD_MODEL_FAILED -3
-#define EREAD_IMAGE_FAILED -4
-#define EBAD_CHKSUM -5
-#define EFILE_TOO_BIG -6
-#define EINVALID_FORMAT -7
-
/* Set this to true to enable lcd_update() in the printf function */
extern bool verbose;
@@ -42,9 +32,7 @@ extern bool verbose;
/* Functions common to all bootloaders */
void reset_screen(void);
int printf(const char *format, ...);
-char *strerror(int error);
void error(int errortype, int error, bool shutdown);
-int load_firmware(unsigned char* buf, char* firmware, int buffer_size);
int load_raw_firmware(unsigned char* buf, char* firmware, int buffer_size);
#ifdef ROCKBOX_HAS_LOGF
void display_logf(void);
diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c
index 7dcbac7dcc..76d72fe506 100644
--- a/bootloader/creativezvm.c
+++ b/bootloader/creativezvm.c
@@ -28,6 +28,8 @@
#include "backlight.h"
#include "button.h"
#include "common.h"
+#include "loader_strerror.h"
+#include "rb-loader.h"
#include "usb.h"
#include "version.h"
@@ -104,15 +106,12 @@ void main(void)
buffer_size = (unsigned char*)0x01900000 - loadbuffer;
ret = load_firmware(loadbuffer, BOOTFILE, buffer_size);
- if(ret < 0)
+ if(ret <= EFILE_EMPTY)
error(EBOOTFILE, ret, true);
-
- else if(ret == EOK)
- {
- kernel_entry = (void*) loadbuffer;
- ret = kernel_entry();
- printf("FAILED!");
- }
+
+ kernel_entry = (void*) loadbuffer;
+ ret = kernel_entry();
+ printf("FAILED!");
}
storage_sleepnow();
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 04c32423a0..5bc6bab720 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -30,6 +30,8 @@
#include "dir.h"
#include "disk.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "power.h"
#include "backlight.h"
#include "usb.h"
@@ -296,7 +298,7 @@ static void NORETURN_ATTR handle_firmware_load(void)
{
int rc = load_firmware(load_buf, BOOTFILE, load_buf_size);
- if(rc < 0)
+ if(rc <= EFILE_EMPTY)
error(EBOOTFILE, rc, true);
/* Pause to look at messages */
@@ -321,11 +323,8 @@ static void NORETURN_ATTR handle_firmware_load(void)
storage_close();
system_prepare_fw_start();
- if (rc == EOK)
- {
- commit_discard_idcache();
- asm volatile ("bx %0": : "r"(start_addr));
- }
+ commit_discard_idcache();
+ asm volatile ("bx %0": : "r"(start_addr));
/* Halt */
while (1)
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index fb03f0ea4d..d77021571a 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -41,6 +41,8 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "rbunicode.h"
#include "usb.h"
#include "mmu-arm.h"
@@ -201,18 +203,15 @@ void main(void)
buffer_size = (unsigned char*)0x31400000 - loadbuffer;
rc = load_firmware(loadbuffer, BOOTFILE, buffer_size);
- if(rc < 0)
+ if(rc <= EFILE_EMPTY)
error(EBOOTFILE, rc, true);
storage_close();
system_prepare_fw_start();
- if (rc == EOK)
- {
- commit_discard_idcache();
- kernel_entry = (void*) loadbuffer;
- rc = kernel_entry();
- }
+ commit_discard_idcache();
+ kernel_entry = (void*) loadbuffer;
+ rc = kernel_entry();
#if 0
/* Halt */
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index b22af0e006..95060e458f 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -43,6 +43,8 @@
#include "powermgmt.h"
#include "file.h"
#include "version.h"
+#include "loader_strerror.h"
+#include "rb-loader.h"
#include "pcf50606.h"
@@ -129,7 +131,6 @@ int initial_gpio_read;
void main(void)
{
- int i;
int rc;
bool rc_on_button = false;
bool on_button = false;
@@ -194,35 +195,22 @@ void main(void)
rc = storage_init();
if(rc)
- {
- printf("ATA error: %d", rc);
- sleep(HZ*5);
- power_off();
- }
+ error(EATA, rc, true);
disk_init();
rc = disk_mount_all();
if (rc<=0)
- {
- printf("No partition found");
- sleep(HZ*5);
- power_off();
- }
+ error(EDISK, rc, true);
printf("Loading firmware");
- i = load_firmware((unsigned char *)DRAM_START, BOOTFILE, MAX_LOADSIZE);
- printf("Result: %s", strerror(i));
-
- if (i < EOK) {
- printf("Error!");
- printf("Can't load " BOOTFILE ": ");
- printf(strerror(rc));
- sleep(HZ*3);
- power_off();
- } else {
- start_firmware();
- }
+
+ rc = load_firmware((unsigned char *)DRAM_START, BOOTFILE, MAX_LOADSIZE);
+
+ if (rc <= EFILE_EMPTY)
+ error(EBOOTFILE, rc, true);
+
+ start_firmware();
}
/* These functions are present in the firmware library, but we reimplement
diff --git a/bootloader/imx233.c b/bootloader/imx233.c
index dfd4b0b28b..0923d8b699 100644
--- a/bootloader/imx233.c
+++ b/bootloader/imx233.c
@@ -31,6 +31,8 @@
#include "backlight.h"
#include "button-target.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "storage.h"
#include "disk.h"
#include "panic.h"
@@ -180,7 +182,7 @@ void main(uint32_t arg, uint32_t addr)
loadbuffer = (unsigned char*)loadaddress;
buffer_size = (int)(loadaddressend - loadaddress);
- while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) < 0)
+ while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY)
{
error(EBOOTFILE, ret, true);
}
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index af4c1576bb..3f9604ae4b 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -42,6 +42,8 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "hwcompat.h"
#include "usb.h"
#include "version.h"
@@ -376,7 +378,7 @@ void* main(void)
rc=load_firmware(loadbuffer, "apple_os.ipod", MAX_LOADSIZE);
- if (rc == EOK) {
+ if (rc > 0) {
printf("apple_os.ipod loaded.");
return (void*)DRAM_START;
} else if (rc == EFILE_NOT_FOUND) {
@@ -387,10 +389,10 @@ void* main(void)
/* We have a copy of the retailos in RAM, lets just run it. */
return (void*)DRAM_START;
}
- } else if (rc < EFILE_NOT_FOUND) {
+ } else {
printf("Error!");
printf("Can't load apple_os.ipod:");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
}
/* Everything failed - just loop forever */
@@ -399,17 +401,17 @@ void* main(void)
} else if (btn==BUTTON_PLAY) {
printf("Loading Linux...");
rc=load_raw_firmware(loadbuffer, "/linux.bin", MAX_LOADSIZE);
- if (rc < EOK) {
+ if (rc <= EFILE_EMPTY) {
printf("Error!");
printf("Can't load linux.bin:");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
} else {
return (void*)DRAM_START;
}
} else {
printf("Loading Rockbox...");
rc=load_firmware(loadbuffer, BOOTFILE, MAX_LOADSIZE);
- if (rc == EOK) {
+ if (rc > 0) {
printf("Rockbox loaded.");
return (void*)DRAM_START;
} else if (rc == EFILE_NOT_FOUND) {
@@ -424,7 +426,7 @@ void* main(void)
printf("Error!");
printf("Can't load " BOOTFILE ": ");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
}
/* If we get to here, then we haven't been able to load any firmware */
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c
index be714c6273..c5fa6e2e65 100644
--- a/bootloader/ipodnano2g.c
+++ b/bootloader/ipodnano2g.c
@@ -44,6 +44,8 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "version.h"
/* Safety measure - maximum allowed firmware image size.
@@ -238,10 +240,10 @@ void main(void)
printf("Loading Rockbox...");
rc=load_firmware(loadbuffer, BOOTFILE, MAX_LOADSIZE);
- if (rc != EOK) {
+ if (rc <= EFILE_EMPTY) {
printf("Error!");
printf("Can't load " BOOTFILE ": ");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
fatal_error();
}
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index 9042737406..77624526e5 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -46,6 +46,8 @@
#include "eeprom_settings.h"
#include "rbunicode.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "version.h"
#include <stdarg.h>
@@ -608,9 +610,9 @@ void main(void)
printf("Loading firmware");
i = load_firmware((unsigned char *)DRAM_START, BOOTFILE, MAX_LOADSIZE);
if(i < 0)
- printf("Error: %s", strerror(i));
+ printf("Error: %s", loader_strerror(i));
- if (i == EOK)
+ if (i > 0)
start_firmware();
if (!detect_original_firmware())
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index b6d7da20fa..4b36e40e61 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -45,6 +45,8 @@
#include "file.h"
#include "pcf50606.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "rbunicode.h"
#include "isp1362.h"
#include "version.h"
@@ -361,10 +363,10 @@ void main(void)
printf("Loading firmware");
i = load_firmware((unsigned char *)DRAM_START, BOOTFILE, MAX_LOADSIZE);
- if(i < 0)
- printf("Error: %s", strerror(i));
+ if(i <= EFILE_EMPTY)
+ printf("Error: %s", loader_strerror(i));
- if (i == EOK)
+ if (i > 0)
start_firmware();
if (!detect_original_firmware())
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index 72d45712fc..b03a5a75c6 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -37,6 +37,8 @@
#include "button.h"
#include "disk.h"
#include "crc32-mi4.h"
+#include "mi4-loader.h"
+#include "loader_strerror.h"
#include <string.h>
#include "power.h"
#include "version.h"
@@ -110,21 +112,6 @@ unsigned char *loadbuffer = (unsigned char *)DRAM_START;
#define MI4_HEADER_SIZE 0x200
-/* mi4 header structure */
-struct mi4header_t {
- unsigned char magic[4];
- uint32_t version;
- uint32_t length;
- uint32_t crc32;
- uint32_t enctype;
- uint32_t mi4size;
- uint32_t plaintext;
- uint32_t dsa_key[10];
- uint32_t pad[109];
- unsigned char type[4];
- unsigned char model[4];
-};
-
/* PPMI header structure */
struct ppmi_header_t {
unsigned char magic[4];
@@ -132,236 +119,6 @@ struct ppmi_header_t {
uint32_t pad[126];
};
-inline unsigned int le2int(unsigned char* buf)
-{
- int32_t res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-
- return res;
-}
-
-inline void int2le(unsigned int val, unsigned char* addr)
-{
- addr[0] = val & 0xFF;
- addr[1] = (val >> 8) & 0xff;
- addr[2] = (val >> 16) & 0xff;
- addr[3] = (val >> 24) & 0xff;
-}
-
-struct tea_key {
- const char * name;
- uint32_t key[4];
-};
-
-#define NUM_KEYS (sizeof(tea_keytable)/sizeof(tea_keytable[0]))
-struct tea_key tea_keytable[] = {
- { "default" , { 0x20d36cc0, 0x10e8c07d, 0xc0e7dcaa, 0x107eb080 } },
- { "sansa", { 0xe494e96e, 0x3ee32966, 0x6f48512b, 0xa93fbb42 } },
- { "sansa_gh", { 0xd7b10538, 0xc662945b, 0x1b3fce68, 0xf389c0e6 } },
- { "sansa_103", { 0x1d29ddc0, 0x2579c2cd, 0xce339e1a, 0x75465dfe } },
- { "rhapsody", { 0x7aa9c8dc, 0xbed0a82a, 0x16204cc7, 0x5904ef38 } },
- { "p610", { 0x950e83dc, 0xec4907f9, 0x023734b9, 0x10cfb7c7 } },
- { "p640", { 0x220c5f23, 0xd04df68e, 0x431b5e25, 0x4dcc1fa1 } },
- { "virgin", { 0xe83c29a1, 0x04862973, 0xa9b3f0d4, 0x38be2a9c } },
- { "20gc_eng", { 0x0240772c, 0x6f3329b5, 0x3ec9a6c5, 0xb0c9e493 } },
- { "20gc_fre", { 0xbede8817, 0xb23bfe4f, 0x80aa682d, 0xd13f598c } },
- { "elio_p722", { 0x6af3b9f8, 0x777483f5, 0xae8181cc, 0xfa6d8a84 } },
- { "c200", { 0xbf2d06fa, 0xf0e23d59, 0x29738132, 0xe2d04ca7 } },
- { "c200_103", { 0x2a7968de, 0x15127979, 0x142e60a7, 0xe49c1893 } },
- { "c200_106", { 0xa913d139, 0xf842f398, 0x3e03f1a6, 0x060ee012 } },
- { "view", { 0x70e19bda, 0x0c69ea7d, 0x2b8b1ad1, 0xe9767ced } },
- { "sa9200", { 0x33ea0236, 0x9247bdc5, 0xdfaedf9f, 0xd67c9d30 } },
- { "hdd1630/hdd63x0", { 0x04543ced, 0xcebfdbad, 0xf7477872, 0x0d12342e } },
- { "vibe500", { 0xe3a66156, 0x77c6b67a, 0xe821dca5, 0xca8ca37c } },
-};
-
-/*
-
-tea_decrypt() from http://en.wikipedia.org/wiki/Tiny_Encryption_Algorithm
-
-"Following is an adaptation of the reference encryption and decryption
-routines in C, released into the public domain by David Wheeler and
-Roger Needham:"
-
-*/
-
-/* NOTE: The mi4 version of TEA uses a different initial value to sum compared
- to the reference implementation and the main loop is 8 iterations, not
- 32.
-*/
-
-static void tea_decrypt(uint32_t* v0, uint32_t* v1, uint32_t* k) {
- uint32_t sum=0xF1BBCDC8, i; /* set up */
- uint32_t delta=0x9E3779B9; /* a key schedule constant */
- uint32_t k0=k[0], k1=k[1], k2=k[2], k3=k[3]; /* cache key */
- for(i=0; i<8; i++) { /* basic cycle start */
- *v1 -= ((*v0<<4) + k2) ^ (*v0 + sum) ^ ((*v0>>5) + k3);
- *v0 -= ((*v1<<4) + k0) ^ (*v1 + sum) ^ ((*v1>>5) + k1);
- sum -= delta; /* end cycle */
- }
-}
-
-/* mi4 files are encrypted in 64-bit blocks (two little-endian 32-bit
- integers) and the key is incremented after each block
- */
-
-static void tea_decrypt_buf(unsigned char* src, unsigned char* dest, size_t n, uint32_t * key)
-{
- uint32_t v0, v1;
- unsigned int i;
-
- for (i = 0; i < (n / 8); i++) {
- v0 = le2int(src);
- v1 = le2int(src+4);
-
- tea_decrypt(&v0, &v1, key);
-
- int2le(v0, dest);
- int2le(v1, dest+4);
-
- src += 8;
- dest += 8;
-
- /* Now increment the key */
- key[0]++;
- if (key[0]==0) {
- key[1]++;
- if (key[1]==0) {
- key[2]++;
- if (key[2]==0) {
- key[3]++;
- }
- }
- }
- }
-}
-
-static int tea_find_key(struct mi4header_t *mi4header, unsigned char* buf)
-{
- unsigned int i;
- uint32_t key[4];
- uint32_t keyinc;
- unsigned char magic_dec[8];
- int key_found = -1;
- unsigned int magic_location = mi4header->length-4;
- int unaligned = 0;
-
- if ( (magic_location % 8) != 0 )
- {
- unaligned = 1;
- magic_location -= 4;
- }
-
- printf("Searching for key:");
-
- for (i=0; i < NUM_KEYS && (key_found<0) ; i++) {
- key[0] = tea_keytable[i].key[0];
- key[1] = tea_keytable[i].key[1];
- key[2] = tea_keytable[i].key[2];
- key[3] = tea_keytable[i].key[3];
-
- /* Now increment the key */
- keyinc = (magic_location-mi4header->plaintext)/8;
- if ((key[0]+keyinc) < key[0]) key[1]++;
- key[0] += keyinc;
- if (key[1]==0) key[2]++;
- if (key[2]==0) key[3]++;
-
- /* Decrypt putative magic */
- tea_decrypt_buf(&buf[magic_location], magic_dec, 8, key);
-
- if (le2int(&magic_dec[4*unaligned]) == 0xaa55aa55)
- {
- key_found = i;
- printf("%s...found", tea_keytable[i].name);
- } else {
- /* printf("%s...failed", tea_keytable[i].name); */
- }
- }
-
- return key_found;
-}
-
-
-/* Load mi4 format firmware image */
-int load_mi4(unsigned char* buf, char* firmware, unsigned int buffer_size)
-{
- int fd;
- struct mi4header_t mi4header;
- int rc;
- unsigned long sum;
- char filename[MAX_PATH];
-
- snprintf(filename,sizeof(filename), BOOTDIR "/%s",firmware);
- fd = open(filename, O_RDONLY);
- if(fd < 0)
- {
- snprintf(filename,sizeof(filename),"/%s",firmware);
- fd = open(filename, O_RDONLY);
- if(fd < 0)
- return EFILE_NOT_FOUND;
- }
-
- read(fd, &mi4header, MI4_HEADER_SIZE);
-
- /* MI4 file size */
- printf("mi4 size: %x", mi4header.mi4size);
-
- if ((mi4header.mi4size-MI4_HEADER_SIZE) > buffer_size)
- {
- close(fd);
- return EFILE_TOO_BIG;
- }
-
- /* CRC32 */
- printf("CRC32: %x", mi4header.crc32);
-
- /* Rockbox model id */
- printf("Model id: %.4s", mi4header.model);
-
- /* Read binary type (RBOS, RBBL) */
- printf("Binary type: %.4s", mi4header.type);
-
- /* Load firmware file */
- lseek(fd, MI4_HEADER_SIZE, SEEK_SET);
- rc = read(fd, buf, mi4header.mi4size-MI4_HEADER_SIZE);
- close(fd);
- if(rc < (int)mi4header.mi4size-MI4_HEADER_SIZE)
- return EREAD_IMAGE_FAILED;
-
- /* Check CRC32 to see if we have a valid file */
- sum = chksum_crc32 (buf, mi4header.mi4size - MI4_HEADER_SIZE);
-
- printf("Calculated CRC32: %x", sum);
-
- if(sum != mi4header.crc32)
- return EBAD_CHKSUM;
-
- if( (mi4header.plaintext + MI4_HEADER_SIZE) != mi4header.mi4size)
- {
- /* Load encrypted firmware */
- int key_index = tea_find_key(&mi4header, buf);
-
- if (key_index < 0)
- return EINVALID_FORMAT;
-
- /* Plaintext part is already loaded */
- buf += mi4header.plaintext;
-
- /* Decrypt in-place */
- tea_decrypt_buf(buf, buf,
- mi4header.mi4size-(mi4header.plaintext+MI4_HEADER_SIZE),
- tea_keytable[key_index].key);
-
- printf("%s key used", tea_keytable[key_index].name);
-
- /* Check decryption was successfull */
- if(le2int(&buf[mi4header.length-mi4header.plaintext-4]) != 0xaa55aa55)
- return EREAD_IMAGE_FAILED;
- }
-
- return EOK;
-}
-
#if (CONFIG_STORAGE & STORAGE_SD)
/* Load mi4 firmware from a hidden disk partition */
int load_mi4_part(unsigned char* buf, struct partinfo* pinfo,
@@ -432,7 +189,7 @@ int load_mi4_part(unsigned char* buf, struct partinfo* pinfo,
(void) disable_rebuild;
#endif
- return EOK;
+ return mi4header.mi4size-MI4_HEADER_SIZE;
}
#endif /* (CONFIG_STORAGE & STORAGE_SD) */
@@ -528,6 +285,7 @@ static int handle_usb(int connect_timeout)
void* main(void)
{
+ char filename[MAX_PATH];
int i;
int btn;
int rc;
@@ -642,13 +400,15 @@ void* main(void)
if((btn & BOOTLOADER_BOOT_OF) == 0)
{
printf("Loading Rockbox...");
- rc = load_mi4(loadbuffer, BOOTFILE, MAX_LOADSIZE);
- if (rc < EOK)
+ snprintf(filename,sizeof(filename), BOOTDIR "/%s", BOOTFILE);
+
+ rc = load_mi4(loadbuffer, filename, MAX_LOADSIZE);
+ if (rc <= EFILE_EMPTY)
{
bool old_verbose = verbose;
verbose = true;
printf("Can't load " BOOTFILE ": ");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
verbose = old_verbose;
btn |= BOOTLOADER_BOOT_OF;
sleep(5*HZ);
@@ -676,9 +436,9 @@ void* main(void)
{
rc = load_mi4_part(loadbuffer, pinfo, MAX_LOADSIZE,
usb == USB_INSERTED);
- if (rc < EOK) {
+ if (rc <= EFILE_EMPTY) {
printf("Can't load from partition");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
} else {
goto main_exit;
}
@@ -690,9 +450,9 @@ void* main(void)
#if defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) || defined(PHILIPS_SA9200)
printf("Trying /System/OF.ebn");
rc=load_mi4(loadbuffer, "/System/OF.ebn", MAX_LOADSIZE);
- if (rc < EOK) {
+ if (rc <= EFILE_EMPTY) {
printf("Can't load /System/OF.ebn");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
} else {
goto main_exit;
}
@@ -700,9 +460,9 @@ void* main(void)
printf("Trying /System/OF.mi4");
rc=load_mi4(loadbuffer, "/System/OF.mi4", MAX_LOADSIZE);
- if (rc < EOK) {
+ if (rc <= EFILE_EMPTY) {
printf("Can't load /System/OF.mi4");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
} else {
#if defined(SAMSUNG_YH925)
lcd_reset();
@@ -712,9 +472,9 @@ void* main(void)
printf("Trying /System/OF.bin");
rc=load_raw_firmware(loadbuffer, "/System/OF.bin", MAX_LOADSIZE);
- if (rc < EOK) {
+ if (rc <= EFILE_EMPTY) {
printf("Can't load /System/OF.bin");
- printf(strerror(rc));
+ printf(loader_strerror(rc));
} else {
#if defined(SAMSUNG_YH925)
lcd_reset();
diff --git a/bootloader/mini2440.c b/bootloader/mini2440.c
index 2ff93a407e..7750d07559 100644
--- a/bootloader/mini2440.c
+++ b/bootloader/mini2440.c
@@ -39,6 +39,8 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "sd.h"
#include "backlight-target.h"
#include "lcd-target.h"
@@ -97,26 +99,23 @@ int main(void)
printf("Loading firmware");
/* Flush out anything pending first */
- cpucache_invalidate();
+ commit_discard_idcache();
loadbuffer = (unsigned char*) 0x31000000;
buffer_size = (unsigned char*)0x31400000 - loadbuffer;
rc = load_firmware(loadbuffer, BOOTFILE, buffer_size);
- if(rc < 0)
+ if(rc <= 0)
error(EBOOTFILE, rc, true);
-
+
printf("Loaded firmware %d\n", rc);
/* storage_close(); */
system_prepare_fw_start();
- if (rc == EOK)
- {
- cpucache_invalidate();
- kernel_entry = (void*) loadbuffer;
- rc = kernel_entry();
- }
+ commit_discard_idcache();
+ kernel_entry = (void*) loadbuffer;
+ rc = kernel_entry();
/* end stop - should not get here */
led_flash(LED_ALL, LED_NONE);
diff --git a/bootloader/mpio_hd200_hd300.c b/bootloader/mpio_hd200_hd300.c
index 3e4ba76c83..1828907ea7 100644
--- a/bootloader/mpio_hd200_hd300.c
+++ b/bootloader/mpio_hd200_hd300.c
@@ -43,6 +43,8 @@
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "version.h"
#include <stdarg.h>
@@ -199,35 +201,21 @@ static void rb_boot(void)
rc = storage_init();
if(rc)
- {
- printf("ATA error: %d", rc);
- sleep(HZ*5);
- return;
- }
+ error(EATA, rc, true);
disk_init();
rc = disk_mount_all();
- if (rc<=0)
- {
- printf("No partition found");
- sleep(HZ*5);
- return;
- }
+ if (rc <= 0)
+ error(EDISK, rc, true);
printf("Loading firmware");
rc = load_firmware((unsigned char *)DRAM_START,
BOOTFILE, MAX_LOADSIZE);
- if (rc < EOK)
- {
- printf("Error!");
- printf("Can't load " BOOTFILE ": ");
- printf("Result: %s", strerror(rc));
- sleep(HZ*5);
- return;
- }
+ if (rc <= EFILE_EMPTY)
+ error(EBOOTFILE, rc, true);
cpu_boost(false);
start_rockbox();
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c
index 5b9c520d02..642945487d 100644
--- a/bootloader/mrobe500.c
+++ b/bootloader/mrobe500.c
@@ -38,6 +38,8 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "rbunicode.h"
#include "usb.h"
#include "spi.h"
@@ -138,12 +140,12 @@ void main(void)
buffer_size = (unsigned char*)0x01900000 - loadbuffer;
rc = load_firmware(loadbuffer, BOOTFILE, buffer_size);
- if(rc < 0)
+ if(rc <= EFILE_EMPTY)
error(EBOOTFILE, rc, true);
- if (rc == EOK)
- {
- kernel_entry = (void*) loadbuffer;
- rc = kernel_entry();
- }
+ kernel_entry = (void*) loadbuffer;
+ rc = kernel_entry();
+
+ /* Should not get here! */
+ return rc;
}
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index 7b4615b10b..4d0bf4221c 100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -29,6 +29,8 @@
#include "system.h"
#include "button.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "storage.h"
#include "disk.h"
#include "string.h"
@@ -148,7 +150,7 @@ static int boot_rockbox(void)
printf("Loading firmware...");
rc = load_firmware((unsigned char *)CONFIG_SDRAM_START, BOOTFILE, 0x400000);
- if(rc < 0)
+ if(rc <= EFILE_EMPTY)
return rc;
else
{
@@ -303,8 +305,8 @@ int main(void)
#endif
rc = boot_rockbox();
- if(rc < 0)
- printf("Error: %s", strerror(rc));
+ if(rc <= EFILE_EMPTY)
+ printf("Error: %s", loader_strerror(rc));
/* Halt */
while (1)
diff --git a/bootloader/rk27xx.c b/bootloader/rk27xx.c
index 552ec8a2d0..209004885f 100644
--- a/bootloader/rk27xx.c
+++ b/bootloader/rk27xx.c
@@ -20,6 +20,7 @@
#include "rkw-loader.h"
#include "version.h"
#include "i2c-rk27xx.h"
+#include "loader_strerror.h"
/* beginning of DRAM */
#define DRAM_ORIG 0x60000000
@@ -161,11 +162,10 @@ void main(void)
printf("Loading: %s", filename);
ret = load_rkw(loadbuffer, filename, LOAD_SIZE);
- if (ret < 0)
+
+ if (ret <= EFILE_EMPTY)
{
- printf(rkw_strerror(ret));
- lcd_update();
- sleep(5*HZ);
+ error(EBOOTFILE, ret, false);
/* if we boot rockbox we shutdown on error
* if we boot OF we fall back to rkusb mode on error
@@ -186,7 +186,7 @@ void main(void)
else
{
/* print 'Loading OK' */
- printf(rkw_strerror(0));
+ printf("Loading OK");
sleep(HZ);
}
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index c21f51a7ad..b28ccf43e7 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -35,6 +35,8 @@
#include "backlight.h"
#include "button-target.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "storage.h"
#include "disk.h"
#include "panic.h"
@@ -147,7 +149,7 @@ void main(void)
loadbuffer = (unsigned char*)DRAM_ORIG; /* DRAM */
buffer_size = (int)(loadbuffer + (DRAM_SIZE) - TTB_SIZE);
- while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) < 0)
+ while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY)
{
#ifdef USE_ROCKBOX_USB
error(EBOOTFILE, ret, false);
diff --git a/bootloader/sansaconnect.c b/bootloader/sansaconnect.c
index 6b2a7e6124..bd6a4b78ff 100644
--- a/bootloader/sansaconnect.c
+++ b/bootloader/sansaconnect.c
@@ -27,6 +27,7 @@
#include "backlight.h"
#include "button.h"
#include "common.h"
+#include "rb-loader.h"
#include "version.h"
#include "uart-target.h"
#include "power.h"
@@ -115,11 +116,11 @@ void main(void)
ret = load_firmware(loadbuffer, BOOTFILE, buffer_size);
- if(ret < 0)
+ if(ret <= EFILE_EMPTY)
{
error(EBOOTFILE, ret, true);
}
- else if(ret == EOK)
+ else
{
system_prepare_fw_start();
diff --git a/bootloader/telechips.c b/bootloader/telechips.c
index fca475e20d..af4ec72bc4 100644
--- a/bootloader/telechips.c
+++ b/bootloader/telechips.c
@@ -43,6 +43,8 @@
#include "power.h"
#include "file.h"
#include "common.h"
+#include "rb-loader.h"
+#include "loader_strerror.h"
#include "version.h"
/* Show the Rockbox logo - in show_logo.c */
@@ -170,11 +172,11 @@ void* main(void)
rc = load_firmware(loadbuffer, BOOTFILE, MAX_LOAD_SIZE);
- if (rc < 0)
+ if (rc <= EFILE_EMPTY)
{
error(EBOOTFILE,rc, true);
}
- else if (rc == EOK)
+ else
{
int(*kernel_entry)(void) = (void *) loadbuffer;