"mv m200v2 m200v4"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19060 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg
parent
ab7ac8b8bd
commit
044ba22b93
|
|
@ -1062,13 +1062,13 @@ target/arm/as3525/as3525-codec.c
|
|||
#endif /* !SIMULATOR */
|
||||
#endif /* SANSA_E200V2 */
|
||||
|
||||
#ifdef SANSA_M200V2
|
||||
#ifdef SANSA_M200V4
|
||||
#ifndef SIMULATOR
|
||||
target/arm/lcd-ssd1815.c
|
||||
target/arm/as3525/sansa-m200v2/button-m200v2.c
|
||||
target/arm/as3525/sansa-m200v4/button-m200v4.c
|
||||
target/arm/as3525/as3525-codec.c
|
||||
#endif /* !SIMULATOR */
|
||||
#endif /* SANSA_M200V2 */
|
||||
#endif /* SANSA_M200V4 */
|
||||
|
||||
#ifdef SANSA_FUZE
|
||||
#ifndef SIMULATOR
|
||||
|
|
|
|||
|
|
@ -323,8 +323,8 @@
|
|||
#include "config-clip.h"
|
||||
#elif defined(SANSA_E200V2)
|
||||
#include "config-e200v2.h"
|
||||
#elif defined(SANSA_M200V2)
|
||||
#include "config-m200v2.h"
|
||||
#elif defined(SANSA_M200V4)
|
||||
#include "config-m200v4.h"
|
||||
#elif defined(SANSA_FUZE)
|
||||
#include "config-fuze.h"
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ LIBUCL=../../tools/ucl/src/libucl.a
|
|||
#
|
||||
# If anyone reading this wants to improve this makefile, please do!
|
||||
|
||||
BOOTIMAGES = bootimg_clip.o bootimg_e200v2.o bootimg_m200v2.o bootimg_fuze.o
|
||||
BOOTHEADERS = bootimg_clip.h bootimg_e200v2.h bootimg_m200v2.h bootimg_fuze.h
|
||||
BOOTIMAGES = bootimg_clip.o bootimg_e200v2.o bootimg_m200v4.o bootimg_fuze.o
|
||||
BOOTHEADERS = bootimg_clip.h bootimg_e200v2.h bootimg_m200v4.h bootimg_fuze.h
|
||||
|
||||
CLIPFILES = dualboot-clip.o dualboot-clip.elf dualboot-clip.o \
|
||||
dualboot-clip.bin bootimg_clip.c bootimg_clip.h
|
||||
|
|
@ -19,8 +19,8 @@ CLIPFILES = dualboot-clip.o dualboot-clip.elf dualboot-clip.o \
|
|||
E200V2FILES = dualboot-e200v2.o dualboot-e200v2.elf dualboot-e200v2.o \
|
||||
dualboot-e200v2.bin bootimg_e200v2.c bootimg_e200v2.h
|
||||
|
||||
M200V2FILES = dualboot-m200v2.o dualboot-m200v2.elf dualboot-m200v2.o \
|
||||
dualboot-m200v2.bin bootimg_m200v2.c bootimg_m200v2.h
|
||||
M200V4FILES = dualboot-m200v4.o dualboot-m200v4.elf dualboot-m200v4.o \
|
||||
dualboot-m200v4.bin bootimg_m200v4.c bootimg_m200v4.h
|
||||
|
||||
FUZEFILES = dualboot-fuze.o dualboot-fuze.elf dualboot-fuze.o \
|
||||
dualboot-fuze.bin bootimg_fuze.c bootimg_fuze.h
|
||||
|
|
@ -93,22 +93,22 @@ bootimg_e200v2.c bootimg_e200v2.h: dualboot-e200v2.bin bin2c
|
|||
bootimg_e200v2.o: bootimg_e200v2.c
|
||||
gcc -c -o bootimg_e200v2.o bootimg_e200v2.c
|
||||
|
||||
# M200V2
|
||||
# M200V4
|
||||
|
||||
dualboot-m200v2.o: dualboot.S
|
||||
arm-elf-gcc -DSANSA_M200V2 -c -o dualboot-m200v2.o dualboot.S
|
||||
dualboot-m200v4.o: dualboot.S
|
||||
arm-elf-gcc -DSANSA_M200V4 -c -o dualboot-m200v4.o dualboot.S
|
||||
|
||||
dualboot-m200v2.elf: dualboot-m200v2.o
|
||||
arm-elf-ld -e 0 -Ttext=0 -o dualboot-m200v2.elf dualboot-m200v2.o
|
||||
dualboot-m200v4.elf: dualboot-m200v4.o
|
||||
arm-elf-ld -e 0 -Ttext=0 -o dualboot-m200v4.elf dualboot-m200v4.o
|
||||
|
||||
dualboot-m200v2.bin: dualboot-m200v2.elf
|
||||
arm-elf-objcopy -O binary dualboot-m200v2.elf dualboot-m200v2.bin
|
||||
dualboot-m200v4.bin: dualboot-m200v4.elf
|
||||
arm-elf-objcopy -O binary dualboot-m200v4.elf dualboot-m200v4.bin
|
||||
|
||||
bootimg_m200v2.c bootimg_m200v2.h: dualboot-m200v2.bin bin2c
|
||||
./bin2c dualboot-m200v2.bin bootimg_m200v2
|
||||
bootimg_m200v4.c bootimg_m200v4.h: dualboot-m200v4.bin bin2c
|
||||
./bin2c dualboot-m200v4.bin bootimg_m200v4
|
||||
|
||||
bootimg_m200v2.o: bootimg_m200v2.c
|
||||
gcc -c -o bootimg_m200v2.o bootimg_m200v2.c
|
||||
bootimg_m200v4.o: bootimg_m200v4.c
|
||||
gcc -c -o bootimg_m200v4.o bootimg_m200v4.c
|
||||
|
||||
# Rules for the ucl unpack function
|
||||
nrv2e_d8.o: nrv2e_d8.S
|
||||
|
|
@ -134,4 +134,4 @@ bin2c: bin2c.c
|
|||
clean:
|
||||
rm -f mkamsboot mkamsboot.o nrv2e_d8.o nrv2e_d8.elf nrv2e_d8.bin *~ \
|
||||
bin2c uclimg.c uclimg.h uclimg.o md5.o \
|
||||
$(BOOTIMAGES) $(CLIPFILES) $(E200V2FILES) $(M200V2FILES) $(FUZEFILES)
|
||||
$(BOOTIMAGES) $(CLIPFILES) $(E200V2FILES) $(M200V4FILES) $(FUZEFILES)
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ execution to the uncompressed firmware.
|
|||
#include "bootimg_clip.h"
|
||||
#include "bootimg_e200v2.h"
|
||||
#include "bootimg_fuze.h"
|
||||
#include "bootimg_m200v2.h"
|
||||
#include "bootimg_m200v4.h"
|
||||
|
||||
/* Win32 compatibility */
|
||||
#ifndef O_BINARY
|
||||
|
|
@ -130,7 +130,7 @@ static const unsigned char* bootloaders[] =
|
|||
bootimg_clip,
|
||||
NULL,
|
||||
bootimg_e200v2,
|
||||
bootimg_m200v2,
|
||||
bootimg_m200v4,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ static const int bootloader_sizes[] =
|
|||
sizeof(bootimg_clip),
|
||||
0,
|
||||
sizeof(bootimg_e200v2),
|
||||
sizeof(bootimg_m200v2),
|
||||
sizeof(bootimg_m200v4),
|
||||
0
|
||||
};
|
||||
|
||||
|
|
@ -485,7 +485,8 @@ int main(int argc, char* argv[])
|
|||
}
|
||||
|
||||
|
||||
/* TODO: Do some more sanity checks on the OF image. Some images (like m200v2) dont have a checksum at the end, only padding (0xdeadbeef). */
|
||||
/* TODO: Do some more sanity checks on the OF image. Some images (like
|
||||
m200v4) dont have a checksum at the end, only padding (0xdeadbeef). */
|
||||
checksum = get_uint32le(buf + len - 4);
|
||||
if (checksum != 0xefbeadde && checksum != calc_checksum(buf, len - 4)) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1720,21 +1720,21 @@ fi
|
|||
|
||||
57|m200v4)
|
||||
target_id=52
|
||||
modelname="m200v2"
|
||||
target="-DSANSA_M200V2"
|
||||
modelname="m200v4"
|
||||
target="-DSANSA_M200V4"
|
||||
memory=2
|
||||
arm9tdmicc
|
||||
bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
|
||||
bmp2rb_native="$bmp2rb_mono"
|
||||
tool="$rootdir/tools/scramble -add=m2v2"
|
||||
output="rockbox.sansa"
|
||||
bootoutput="bootloader-m200v2.sansa"
|
||||
bootoutput="bootloader-m200v4.sansa"
|
||||
appextra="recorder:gui"
|
||||
plugins=""
|
||||
toolset=$scramblebitmaptools
|
||||
t_cpu="arm"
|
||||
t_manufacturer="as3525"
|
||||
t_model="sansa-m200v2"
|
||||
t_model="sansa-m200v4"
|
||||
;;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue