diff options
| -rw-r--r-- | bootloader/SOURCES | 2 | ||||
| -rw-r--r-- | bootloader/common.c | 5 | ||||
| -rw-r--r-- | bootloader/main-pp.c | 4 | ||||
| -rw-r--r-- | bootloader/pb_vibe500.c | 83 | ||||
| -rw-r--r-- | firmware/export/config/vibe500.h | 2 | ||||
| -rwxr-xr-x | tools/configure | 4 |
6 files changed, 11 insertions, 89 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES index b4d3b82a05..b7816c187c 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES @@ -61,6 +61,6 @@ show_logo.c mini2440.c show_logo.c #elif defined(PBELL_VIBE500) -pb_vibe500.c +main-pp.c show_logo.c #endif diff --git a/bootloader/common.c b/bootloader/common.c index 18d7dd4313..2a80f987ad 100644 --- a/bootloader/common.c +++ b/bootloader/common.c @@ -37,7 +37,7 @@ #include "file.h" /* TODO: Other bootloaders need to be adjusted to set this variable to true - on a button press - currently only the ipod, H10 and Sansa versions do. */ + on a button press - currently only the ipod, H10, Vibe 500 and Sansa versions do. */ #if defined(IPOD_ARCH) || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) \ || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \ || (CONFIG_CPU == AS3525) || defined(COWON_D2) \ @@ -45,7 +45,8 @@ || defined(SAMSUNG_YH925) || defined(SAMSUNG_YH920) \ || defined(SAMSUNG_YH820) || defined(PHILIPS_SA9200) \ || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) \ - || defined(ONDA_VX747) || defined(SANSA_CLIPPLUS) + || defined(ONDA_VX747) || defined(SANSA_CLIPPLUS) \ + || defined(PBELL_VIBE500) bool verbose = false; #else bool verbose = true; diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index fe93f14eaa..a2562f8a9d 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c @@ -84,6 +84,9 @@ extern int show_logo(void); #elif CONFIG_KEYPAD == SANSA_FUZE_PAD #define BOOTLOADER_BOOT_OF BUTTON_LEFT +#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD +#define BOOTLOADER_BOOT_OF BUTTON_OK + #endif /* Maximum allowed firmware image size. 10MB is more than enough */ @@ -170,6 +173,7 @@ struct tea_key tea_keytable[] = { { "view", { 0x70e19bda, 0x0c69ea7d, 0x2b8b1ad1, 0xe9767ced } }, { "sa9200", { 0x33ea0236, 0x9247bdc5, 0xdfaedf9f, 0xd67c9d30 } }, { "hdd1630", { 0x04543ced, 0xcebfdbad, 0xf7477872, 0x0d12342e } }, + { "vibe500", { 0xe3a66156, 0x77c6b67a, 0xe821dca5, 0xca8ca37c } }, }; /* diff --git a/bootloader/pb_vibe500.c b/bootloader/pb_vibe500.c deleted file mode 100644 index d9259d43cc..0000000000 --- a/bootloader/pb_vibe500.c +++ /dev/null @@ -1,83 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2009 by Szymon Dziok - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* -The bootloader does nothing and it's not needed (it was used to test different -stuff only), because the original bootloader stored in the flash has ability to -boot three different images in the SYSTEM directory: -jukebox.mi4 - when Power is pressed, -blupd.mi4 - when Power+C combo is used, -tester.mi4 - when Power+OK combo is used. - -So we can use it to dual boot (for example renaming original jukebox.mi4 to -tester.mi4 and the rockbox.mi4 to jukebox.mi4). -*/ - - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> - -#include "config.h" - -#include "inttypes.h" -#include "cpu.h" -#include "system.h" -#include "lcd.h" -#include "kernel.h" -#include "thread.h" -#include "storage.h" -#include "fat.h" -#include "disk.h" -#include "font.h" -#include "backlight.h" -#include "backlight-target.h" -#include "button.h" -#include "panic.h" -#include "power.h" -#include "file.h" -#include "common.h" -#include "i2c.h" - -/* #define UNK_01 (*(volatile unsigned long*)(0x7000a010)) */ - -char version[] = APPSVERSION; - -extern int show_logo(void); - -void main(void) -{ - system_init(); - kernel_init(); - disable_irq(); - lcd_init(); - - show_logo(); - sleep(HZ*2); - - while(1) - { - /* Power off bit */ - if ((button_read_device()&BUTTON_POWER)!=0) - GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL,0x80); - } -} diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h index f8ce86b24f..37e78f7b61 100644 --- a/firmware/export/config/vibe500.h +++ b/firmware/export/config/vibe500.h @@ -191,7 +191,7 @@ #define MI4_FORMAT #define BOOTFILE_EXT "mi4" #define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.system" +#define BOOTDIR "/.rockbox" #define ICODE_ATTR_TREMOR_NOT_MDCT diff --git a/tools/configure b/tools/configure index 25bfd23f1d..63d858e027 100755 --- a/tools/configure +++ b/tools/configure @@ -2502,12 +2502,12 @@ fi tool="$rootdir/tools/scramble -mi4v3 -model=v500 -type=RBOS" bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" bmp2rb_native="$rootdir/tools/bmp2rb -f 5" - output="jukebox.mi4" + output="rockbox.mi4" appextra="recorder:gui" plugins="yes" swcodec="yes" boottool="$rootdir/tools/scramble -mi4v3 -model=v500 -type=RBBL" - bootoutput="rockbox.mi4" + bootoutput="jukebox.mi4" # toolset is the tools within the tools directory that we build for # this particular target. toolset=$scramblebitmaptools |