diff options
| author | Karl Kurbjun <kkurbjun@gmail.com> | 2007-09-30 17:12:20 +0000 |
|---|---|---|
| committer | Karl Kurbjun <kkurbjun@gmail.com> | 2007-09-30 17:12:20 +0000 |
| commit | 3f9a9a1a01df7c73b569232f96a4170ed8910ea2 (patch) | |
| tree | ce63caadc9db19950436cf48c3fdf484329b3d59 | |
| parent | 34308c152206b9c476bf241a93978c0bb624e316 (diff) | |
| download | rockbox-3f9a9a1a01df7c73b569232f96a4170ed8910ea2.zip rockbox-3f9a9a1a01df7c73b569232f96a4170ed8910ea2.tar.gz rockbox-3f9a9a1a01df7c73b569232f96a4170ed8910ea2.tar.bz2 rockbox-3f9a9a1a01df7c73b569232f96a4170ed8910ea2.tar.xz | |
Fix the bootloader, and give the M:Robe it's own scramble
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14922 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/boot.lds | 2 | ||||
| -rw-r--r-- | firmware/export/config-mrobe500.h | 2 | ||||
| -rwxr-xr-x | tools/configure | 2 | ||||
| -rw-r--r-- | tools/scramble.c | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/firmware/boot.lds b/firmware/boot.lds index 062370b..8e6f39a 100644 --- a/firmware/boot.lds +++ b/firmware/boot.lds @@ -10,7 +10,7 @@ OUTPUT_ARCH(arm) #ifdef CPU_PP INPUT(target/arm/crt0-pp-bl.o) #elif defined(OLYMPUS_MROBE_500) -INPUT(target/arm/tms320dm320/mrobe-500/crt0.o) +INPUT(target/arm/tms320dm320/crt0.o) #else INPUT(target/arm/crt0.o) #endif diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index fd64070..7bb7fc5 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h @@ -27,7 +27,7 @@ #define OLYMPUS_MROBE_500 1 /* For Rolo and boot loader */ -#define MODEL_NUMBER 19 +#define MODEL_NUMBER 22 /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/tools/configure b/tools/configure index 085c110..ec0fa02 100755 --- a/tools/configure +++ b/tools/configure @@ -1287,7 +1287,7 @@ EOF target="-DMROBE_500" memory=64 # always arm9tdmicc - tool="$rootdir/tools/scramble -add=giga" + tool="$rootdir/tools/scramble -add=m500" bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" bmp2rb_native="$rootdir/tools/bmp2rb -f 4" output="rockbox.mrobe500" diff --git a/tools/scramble.c b/tools/scramble.c index ad12883..ba0eda3 100644 --- a/tools/scramble.c +++ b/tools/scramble.c @@ -107,7 +107,7 @@ void usage(void) "\t-add=X Rockbox generic \"add-up\" checksum format\n" "\t (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n" "\t ip3g, ip4g, mini, iax5, h10, h10_5gb, tpj2,\n" - "\t c200, e200)\n" + "\t c200, e200, giga, m500)\n" "\nNo option results in Archos standard player/recorder format.\n"); exit(1); @@ -249,8 +249,10 @@ int main (int argc, char** argv) modelnum = 19; else if(!strcmp(&argv[1][5], "c200")) modelnum = 20; - else if(!strcmp(&argv[1][5], "gigs")) + else if(!strcmp(&argv[1][5], "gigs")) modelnum = 21; + else if(!strcmp(&argv[1][5], "m500")) + modelnum = 22; else { fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); return 2; |