From 0b29691324e5700f15ea653592bf29f8552d47d7 Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Sun, 4 Mar 2012 15:34:29 +0100 Subject: 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 --- bootloader/mini2440.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'bootloader/mini2440.c') 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); -- cgit v1.2.3