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/creativezvm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'bootloader/creativezvm.c') diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c index 7dcbac7..76d72fe 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(); -- cgit v1.1