From 09cf3c49e7fd862e290f603b8dc150b85a478655 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 12 Oct 2008 23:39:54 +0000 Subject: [PATCH] Necessary changes for 3.0.1 and the upcoming full-flash images: Fix a message for the Player, and bump the flash (bootloader) version. The upcoming images will be version 2. Also change the rombox start address for the Player as bootbox became a little too big. Now it's at (28K+16) as all other archoses. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_0@18794 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/rockbox_flash.c | 4 ++-- firmware/export/config-player.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index d3f0aa4055..fa80ed4adb 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c @@ -30,7 +30,7 @@ PLUGIN_HEADER /* define DUMMY if you only want to "play" with the UI, does no harm */ /* #define DUMMY */ -#define LATEST_BOOTLOADER_VERSION 1 /* update this with the bootloader */ +#define LATEST_BOOTLOADER_VERSION 2 /* update this with the bootloader */ #ifndef UINT8 #define UINT8 unsigned char @@ -939,7 +939,7 @@ void DoUserDialog(char* filename) rb->lcd_puts_scroll(0, 1, "File invalid. Blocksize too small?"); break; case eBadRomLink: - rb->lcd_puts_scroll(0, 1, "BootBox mismatch"); + rb->lcd_puts_scroll(0, 1, "RomBox mismatch."); break; default: rb->lcd_puts_scroll(0, 1, "Check failed."); diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 2fefcbdcac..10e6d6c423 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -75,8 +75,7 @@ #define FIRMWARE_OFFSET_FILE_DATA 6 /* The start address index for ROM builds */ -/* #define ROM_START 0xD010 for behind original Archos */ -#define ROM_START 0x6010 /* for behind BootBox */ +#define ROM_START 0x7010 /* for behind BootBox */ /* Software controlled LED */ #define CONFIG_LED LED_REAL