diff options
author | Daniel Stenberg <daniel@haxx.se> | 2008-11-10 09:27:40 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2008-11-10 09:27:40 +0000 |
commit | 044ba22b93e5b8fdd74c5f8d59d3b63b9d148c41 (patch) | |
tree | 25f2f4d264f06a5f081a58433b2f2b8ea8967596 | |
parent | ab7ac8b8bd5b2fe2b209820ab83cb7cca958abf8 (diff) | |
download | rockbox-044ba22b93e5b8fdd74c5f8d59d3b63b9d148c41.tar.gz rockbox-044ba22b93e5b8fdd74c5f8d59d3b63b9d148c41.zip |
"mv m200v2 m200v4"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19060 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/SOURCES | 6 | ||||
-rw-r--r-- | firmware/export/config.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-m200v2/button-m200v4.c (renamed from firmware/target/arm/as3525/sansa-m200v2/button-m200v2.c) | 0 | ||||
-rw-r--r-- | rbutil/mkamsboot/Makefile | 32 | ||||
-rw-r--r-- | rbutil/mkamsboot/mkamsboot.c | 9 | ||||
-rwxr-xr-x | tools/configure | 8 |
6 files changed, 30 insertions, 29 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 2c3955f4bb..2564a88812 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1062,13 +1062,13 @@ target/arm/as3525/as3525-codec.c | |||
1062 | #endif /* !SIMULATOR */ | 1062 | #endif /* !SIMULATOR */ |
1063 | #endif /* SANSA_E200V2 */ | 1063 | #endif /* SANSA_E200V2 */ |
1064 | 1064 | ||
1065 | #ifdef SANSA_M200V2 | 1065 | #ifdef SANSA_M200V4 |
1066 | #ifndef SIMULATOR | 1066 | #ifndef SIMULATOR |
1067 | target/arm/lcd-ssd1815.c | 1067 | target/arm/lcd-ssd1815.c |
1068 | target/arm/as3525/sansa-m200v2/button-m200v2.c | 1068 | target/arm/as3525/sansa-m200v4/button-m200v4.c |
1069 | target/arm/as3525/as3525-codec.c | 1069 | target/arm/as3525/as3525-codec.c |
1070 | #endif /* !SIMULATOR */ | 1070 | #endif /* !SIMULATOR */ |
1071 | #endif /* SANSA_M200V2 */ | 1071 | #endif /* SANSA_M200V4 */ |
1072 | 1072 | ||
1073 | #ifdef SANSA_FUZE | 1073 | #ifdef SANSA_FUZE |
1074 | #ifndef SIMULATOR | 1074 | #ifndef SIMULATOR |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 4cabaddaaa..3a902230cc 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -323,8 +323,8 @@ | |||
323 | #include "config-clip.h" | 323 | #include "config-clip.h" |
324 | #elif defined(SANSA_E200V2) | 324 | #elif defined(SANSA_E200V2) |
325 | #include "config-e200v2.h" | 325 | #include "config-e200v2.h" |
326 | #elif defined(SANSA_M200V2) | 326 | #elif defined(SANSA_M200V4) |
327 | #include "config-m200v2.h" | 327 | #include "config-m200v4.h" |
328 | #elif defined(SANSA_FUZE) | 328 | #elif defined(SANSA_FUZE) |
329 | #include "config-fuze.h" | 329 | #include "config-fuze.h" |
330 | #else | 330 | #else |
diff --git a/firmware/target/arm/as3525/sansa-m200v2/button-m200v2.c b/firmware/target/arm/as3525/sansa-m200v2/button-m200v4.c index c5d6c4941d..c5d6c4941d 100644 --- a/firmware/target/arm/as3525/sansa-m200v2/button-m200v2.c +++ b/firmware/target/arm/as3525/sansa-m200v2/button-m200v4.c | |||
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile index 93a25aee00..287ea9b72f 100644 --- a/rbutil/mkamsboot/Makefile +++ b/rbutil/mkamsboot/Makefile | |||
@@ -10,8 +10,8 @@ LIBUCL=../../tools/ucl/src/libucl.a | |||
10 | # | 10 | # |
11 | # If anyone reading this wants to improve this makefile, please do! | 11 | # If anyone reading this wants to improve this makefile, please do! |
12 | 12 | ||
13 | BOOTIMAGES = bootimg_clip.o bootimg_e200v2.o bootimg_m200v2.o bootimg_fuze.o | 13 | BOOTIMAGES = bootimg_clip.o bootimg_e200v2.o bootimg_m200v4.o bootimg_fuze.o |
14 | BOOTHEADERS = bootimg_clip.h bootimg_e200v2.h bootimg_m200v2.h bootimg_fuze.h | 14 | BOOTHEADERS = bootimg_clip.h bootimg_e200v2.h bootimg_m200v4.h bootimg_fuze.h |
15 | 15 | ||
16 | CLIPFILES = dualboot-clip.o dualboot-clip.elf dualboot-clip.o \ | 16 | CLIPFILES = dualboot-clip.o dualboot-clip.elf dualboot-clip.o \ |
17 | dualboot-clip.bin bootimg_clip.c bootimg_clip.h | 17 | dualboot-clip.bin bootimg_clip.c bootimg_clip.h |
@@ -19,8 +19,8 @@ CLIPFILES = dualboot-clip.o dualboot-clip.elf dualboot-clip.o \ | |||
19 | E200V2FILES = dualboot-e200v2.o dualboot-e200v2.elf dualboot-e200v2.o \ | 19 | E200V2FILES = dualboot-e200v2.o dualboot-e200v2.elf dualboot-e200v2.o \ |
20 | dualboot-e200v2.bin bootimg_e200v2.c bootimg_e200v2.h | 20 | dualboot-e200v2.bin bootimg_e200v2.c bootimg_e200v2.h |
21 | 21 | ||
22 | M200V2FILES = dualboot-m200v2.o dualboot-m200v2.elf dualboot-m200v2.o \ | 22 | M200V4FILES = dualboot-m200v4.o dualboot-m200v4.elf dualboot-m200v4.o \ |
23 | dualboot-m200v2.bin bootimg_m200v2.c bootimg_m200v2.h | 23 | dualboot-m200v4.bin bootimg_m200v4.c bootimg_m200v4.h |
24 | 24 | ||
25 | FUZEFILES = dualboot-fuze.o dualboot-fuze.elf dualboot-fuze.o \ | 25 | FUZEFILES = dualboot-fuze.o dualboot-fuze.elf dualboot-fuze.o \ |
26 | dualboot-fuze.bin bootimg_fuze.c bootimg_fuze.h | 26 | dualboot-fuze.bin bootimg_fuze.c bootimg_fuze.h |
@@ -93,22 +93,22 @@ bootimg_e200v2.c bootimg_e200v2.h: dualboot-e200v2.bin bin2c | |||
93 | bootimg_e200v2.o: bootimg_e200v2.c | 93 | bootimg_e200v2.o: bootimg_e200v2.c |
94 | gcc -c -o bootimg_e200v2.o bootimg_e200v2.c | 94 | gcc -c -o bootimg_e200v2.o bootimg_e200v2.c |
95 | 95 | ||
96 | # M200V2 | 96 | # M200V4 |
97 | 97 | ||
98 | dualboot-m200v2.o: dualboot.S | 98 | dualboot-m200v4.o: dualboot.S |
99 | arm-elf-gcc -DSANSA_M200V2 -c -o dualboot-m200v2.o dualboot.S | 99 | arm-elf-gcc -DSANSA_M200V4 -c -o dualboot-m200v4.o dualboot.S |
100 | 100 | ||
101 | dualboot-m200v2.elf: dualboot-m200v2.o | 101 | dualboot-m200v4.elf: dualboot-m200v4.o |
102 | arm-elf-ld -e 0 -Ttext=0 -o dualboot-m200v2.elf dualboot-m200v2.o | 102 | arm-elf-ld -e 0 -Ttext=0 -o dualboot-m200v4.elf dualboot-m200v4.o |
103 | 103 | ||
104 | dualboot-m200v2.bin: dualboot-m200v2.elf | 104 | dualboot-m200v4.bin: dualboot-m200v4.elf |
105 | arm-elf-objcopy -O binary dualboot-m200v2.elf dualboot-m200v2.bin | 105 | arm-elf-objcopy -O binary dualboot-m200v4.elf dualboot-m200v4.bin |
106 | 106 | ||
107 | bootimg_m200v2.c bootimg_m200v2.h: dualboot-m200v2.bin bin2c | 107 | bootimg_m200v4.c bootimg_m200v4.h: dualboot-m200v4.bin bin2c |
108 | ./bin2c dualboot-m200v2.bin bootimg_m200v2 | 108 | ./bin2c dualboot-m200v4.bin bootimg_m200v4 |
109 | 109 | ||
110 | bootimg_m200v2.o: bootimg_m200v2.c | 110 | bootimg_m200v4.o: bootimg_m200v4.c |
111 | gcc -c -o bootimg_m200v2.o bootimg_m200v2.c | 111 | gcc -c -o bootimg_m200v4.o bootimg_m200v4.c |
112 | 112 | ||
113 | # Rules for the ucl unpack function | 113 | # Rules for the ucl unpack function |
114 | nrv2e_d8.o: nrv2e_d8.S | 114 | nrv2e_d8.o: nrv2e_d8.S |
@@ -134,4 +134,4 @@ bin2c: bin2c.c | |||
134 | clean: | 134 | clean: |
135 | rm -f mkamsboot mkamsboot.o nrv2e_d8.o nrv2e_d8.elf nrv2e_d8.bin *~ \ | 135 | rm -f mkamsboot mkamsboot.o nrv2e_d8.o nrv2e_d8.elf nrv2e_d8.bin *~ \ |
136 | bin2c uclimg.c uclimg.h uclimg.o md5.o \ | 136 | bin2c uclimg.c uclimg.h uclimg.o md5.o \ |
137 | $(BOOTIMAGES) $(CLIPFILES) $(E200V2FILES) $(M200V2FILES) $(FUZEFILES) | 137 | $(BOOTIMAGES) $(CLIPFILES) $(E200V2FILES) $(M200V4FILES) $(FUZEFILES) |
diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c index 476bdf2158..e9438b317d 100644 --- a/rbutil/mkamsboot/mkamsboot.c +++ b/rbutil/mkamsboot/mkamsboot.c | |||
@@ -92,7 +92,7 @@ execution to the uncompressed firmware. | |||
92 | #include "bootimg_clip.h" | 92 | #include "bootimg_clip.h" |
93 | #include "bootimg_e200v2.h" | 93 | #include "bootimg_e200v2.h" |
94 | #include "bootimg_fuze.h" | 94 | #include "bootimg_fuze.h" |
95 | #include "bootimg_m200v2.h" | 95 | #include "bootimg_m200v4.h" |
96 | 96 | ||
97 | /* Win32 compatibility */ | 97 | /* Win32 compatibility */ |
98 | #ifndef O_BINARY | 98 | #ifndef O_BINARY |
@@ -130,7 +130,7 @@ static const unsigned char* bootloaders[] = | |||
130 | bootimg_clip, | 130 | bootimg_clip, |
131 | NULL, | 131 | NULL, |
132 | bootimg_e200v2, | 132 | bootimg_e200v2, |
133 | bootimg_m200v2, | 133 | bootimg_m200v4, |
134 | NULL | 134 | NULL |
135 | }; | 135 | }; |
136 | 136 | ||
@@ -140,7 +140,7 @@ static const int bootloader_sizes[] = | |||
140 | sizeof(bootimg_clip), | 140 | sizeof(bootimg_clip), |
141 | 0, | 141 | 0, |
142 | sizeof(bootimg_e200v2), | 142 | sizeof(bootimg_e200v2), |
143 | sizeof(bootimg_m200v2), | 143 | sizeof(bootimg_m200v4), |
144 | 0 | 144 | 0 |
145 | }; | 145 | }; |
146 | 146 | ||
@@ -485,7 +485,8 @@ int main(int argc, char* argv[]) | |||
485 | } | 485 | } |
486 | 486 | ||
487 | 487 | ||
488 | /* TODO: Do some more sanity checks on the OF image. Some images (like m200v2) dont have a checksum at the end, only padding (0xdeadbeef). */ | 488 | /* TODO: Do some more sanity checks on the OF image. Some images (like |
489 | m200v4) dont have a checksum at the end, only padding (0xdeadbeef). */ | ||
489 | checksum = get_uint32le(buf + len - 4); | 490 | checksum = get_uint32le(buf + len - 4); |
490 | if (checksum != 0xefbeadde && checksum != calc_checksum(buf, len - 4)) { | 491 | if (checksum != 0xefbeadde && checksum != calc_checksum(buf, len - 4)) { |
491 | 492 | ||
diff --git a/tools/configure b/tools/configure index 122f527162..4283875e5c 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1720,21 +1720,21 @@ fi | |||
1720 | 1720 | ||
1721 | 57|m200v4) | 1721 | 57|m200v4) |
1722 | target_id=52 | 1722 | target_id=52 |
1723 | modelname="m200v2" | 1723 | modelname="m200v4" |
1724 | target="-DSANSA_M200V2" | 1724 | target="-DSANSA_M200V4" |
1725 | memory=2 | 1725 | memory=2 |
1726 | arm9tdmicc | 1726 | arm9tdmicc |
1727 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1727 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
1728 | bmp2rb_native="$bmp2rb_mono" | 1728 | bmp2rb_native="$bmp2rb_mono" |
1729 | tool="$rootdir/tools/scramble -add=m2v2" | 1729 | tool="$rootdir/tools/scramble -add=m2v2" |
1730 | output="rockbox.sansa" | 1730 | output="rockbox.sansa" |
1731 | bootoutput="bootloader-m200v2.sansa" | 1731 | bootoutput="bootloader-m200v4.sansa" |
1732 | appextra="recorder:gui" | 1732 | appextra="recorder:gui" |
1733 | plugins="" | 1733 | plugins="" |
1734 | toolset=$scramblebitmaptools | 1734 | toolset=$scramblebitmaptools |
1735 | t_cpu="arm" | 1735 | t_cpu="arm" |
1736 | t_manufacturer="as3525" | 1736 | t_manufacturer="as3525" |
1737 | t_model="sansa-m200v2" | 1737 | t_model="sansa-m200v4" |
1738 | ;; | 1738 | ;; |
1739 | 1739 | ||
1740 | 1740 | ||