Commit graph

124 commits

Author SHA1 Message Date
Mihail Zenkov
2a1e9eb8a8 Reverting 4327cbc9b8
I do testing incorrectly: fix don't work as expected.

Change-Id: Ie32672ec213861c02295ae0a14e22b9ca9035585
2016-05-04 01:34:08 +00:00
Mihail Zenkov
4327cbc9b8 C2X0v2: use GPIO to check button state in dualboot
C240v2 freeze on booting OF if SD card inserted. Use GPIO instead DBOP should
help.

Change-Id: Idec0028040f91c6d2c7c04327ca0e1af204f58eb
2016-05-03 17:41:36 +02:00
Bertrik Sikken
93de093690 mkamsboot: add support for clip zip original firmware 01.01.21 (tested by me)
Change-Id: Ief8a8e6dfe87a17285dd5259fd3c4cebfc962643
2013-07-12 22:23:36 +02:00
Bertrik Sikken
a28106dc26 Add support for clip+ firmware 1.02.18 to mkamsboot (tested by me)
Change-Id: Ic7d1860c59291e6e5c55b3f91d86de447e53cf66
2012-08-08 19:59:29 +02:00
Dominik Riebeling
c1a71ab9ae Fix a typo and remove line splicing.
Change-Id: Ifce9224e352b2a3efef92aff4bbdde9fc8714587
2012-04-28 21:46:33 +02:00
Bertrik Sikken
a12b2a5df9 mkamsboot: add support for clip zip original firmware 01.01.20 (tested by me)
Change-Id: I1d071539d496c63f47d305375e244f9fbe107ced
2012-04-08 11:46:02 +02:00
Rafaël Carré
88cda7eb26 mkamsboot: fix some Clipv2 that we used to brick
On those models the software bootloader is entered through the SWI vector,
not through the reset vector like we thought.

Use put_uint32le() instead of memcpy
Use mov pc, #0x200 instead of b 0x200, so we can use the same instruction
for both vectors.

Tested on Clipv2 and Clip Zip

Change-Id: I99dc24167dde5558d34fe9795c65b44ff91aa665
2012-01-31 14:23:53 -05:00
Rafaël Carré
d1b47c2eeb Clipv2: fix button reading on some models
We neet to setup the XPD to work as GPIO
storage unaffected
Tested on working-already Clipv2 and on a 'brickable' clipv2

Change-Id: Idcbdfb6bd50d51b7f6f7e00b21df24fac9b3a6d8
2012-01-30 00:13:51 -05:00
Rafaël Carré
76440aa214 mkamsboot: ignore built files / folders 2012-01-24 17:00:26 -05:00
Rafaël Carré
e4614c4208 mkamsboot: update README
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31380 a1c6a512-1295-4272-9138-f99709370657
2011-12-20 18:48:20 +00:00
Rafaël Carré
6a94f6b551 mkamsboot: don't boot OF when USB is plugged
USB now works on all models

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31379 a1c6a512-1295-4272-9138-f99709370657
2011-12-20 18:48:14 +00:00
Dominik Riebeling
84205025c7 libtools.make: add rule to build a DLL.
This only works for Windows, so you need to use it on Windows or set CROSS
accordingly.

Update mkamsboot to make mkamsboot.dll build and link against ucl.dll.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31333 a1c6a512-1295-4272-9138-f99709370657
2011-12-16 21:10:29 +00:00
Dominik Riebeling
d16cefca95 mkamsboot: convert to use libtools.make.
As a result building mkamsboot for Rockbox Utility will now respect BUILD_DIR,
which should eliminate all possibly remaining issues with dualboot.o.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31283 a1c6a512-1295-4272-9138-f99709370657
2011-12-15 18:45:05 +00:00
Bertrik Sikken
c9a8031695 mkamsboot: add support for sansa clip zip firmware version v1.01.18
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31195 a1c6a512-1295-4272-9138-f99709370657
2011-12-10 09:45:28 +00:00
Rafaël Carré
444b17626f mkamsboot: make clip zip boot OF when pressing left button
pressing vol- to boot OF is still possible

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31112 a1c6a512-1295-4272-9138-f99709370657
2011-12-02 18:31:40 +00:00
Rafaël Carré
ab76a0db28 mkamsboot/dualboot: use arm-elf-eabi cross compiler by default
also allows user to change it with CROSS_COMPILE=xxx

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31111 a1c6a512-1295-4272-9138-f99709370657
2011-12-02 18:31:36 +00:00
Bertrik Sikken
1ab2aa1f28 Sansa clip zip: allow original firmware versions 1.1.12, 1.1.15 and 1.1.17 to be patched
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30860 a1c6a512-1295-4272-9138-f99709370657
2011-10-30 08:09:46 +00:00
Bertrik Sikken
e90f961593 Sansa clip zip: update mkamsboot and fix various drivers to make it boot to the main firmware
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30853 a1c6a512-1295-4272-9138-f99709370657
2011-10-29 17:08:05 +00:00
Bertrik Sikken
94c573f3ec Sansa clipzip: miscellaneous updates
* add support for OF version 01.01.17 in mkamsboot
* introduce and implement oled_brightness function
* configure voltage CVDD2 to 2.8V (like the OF does)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30831 a1c6a512-1295-4272-9138-f99709370657
2011-10-23 14:20:47 +00:00
Bertrik Sikken
1195b2384f sansa clipplus: add version 01.02.16 to mkamsboot as a firmware that can be patched
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30726 a1c6a512-1295-4272-9138-f99709370657
2011-10-07 22:49:37 +00:00
Dominik Riebeling
c7c657ca92 Prevent unnecessary rebuilding of libs.
- When building for Rockbox Utility the called Makefiles would rebuild the libs
  every time. Change dependencies a bit to allow make to properly detect if the
  lib is already up to date.
- Remove dependency on output folder in some cases to avoid unnecessary
  rebuilds.
- Add standard Rockbox header to files lacking it.
- Make make calls from qmake silent.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30608 a1c6a512-1295-4272-9138-f99709370657
2011-09-26 20:51:23 +00:00
Bertrik Sikken
2052540972 sansa clipzip: implement default dualboot code (boots to OF unconditionally for now)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30435 a1c6a512-1295-4272-9138-f99709370657
2011-09-05 18:14:29 +00:00
Bertrik Sikken
463b3ed8b2 Initial framework for the Sandisk Sansa Clip Zip
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30365 a1c6a512-1295-4272-9138-f99709370657
2011-08-27 16:21:19 +00:00
Rafaël Carré
1a6172d2a0 mkamsboot: remove useless casts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30115 a1c6a512-1295-4272-9138-f99709370657
2011-07-02 02:49:01 +00:00
Rafaël Carré
621524e001 mkamsboot: correct old comments
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30114 a1c6a512-1295-4272-9138-f99709370657
2011-07-02 02:48:54 +00:00
Dominik Riebeling
02dce4500d mkamsboot: restructure model / firmware file information.
Merge the various arrays holding model specific information into a
structure and give it a distinct name. Avoids problems when linking with
Rockbox Utility.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29177 a1c6a512-1295-4272-9138-f99709370657
2011-01-31 20:15:50 +00:00
Dominik Riebeling
e1b1183f40 Tweak Makefiles a bit to allow cross compiling Rockbox Utility.
- pass AR to the lib Makefiles to make sure the correct one gets used.
- create an archive index for archives.
- simplify ucl Makefile a bit.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28883 a1c6a512-1295-4272-9138-f99709370657
2010-12-23 18:59:58 +00:00
Rafaël Carré
b0db713970 mkamsboot: don't boot OF if USB is plugged (AMSv1 only)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27618 a1c6a512-1295-4272-9138-f99709370657
2010-07-29 23:15:55 +00:00
Rafaël Carré
bff5e3d7ab mkamsboot: take in account the additional 0x200 block when calculating size
Align sizes of different blocks on mkamsboot output

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27482 a1c6a512-1295-4272-9138-f99709370657
2010-07-18 17:05:05 +00:00
Rafaël Carré
765c4f1a97 mkamsboot: update outdated comment
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27442 a1c6a512-1295-4272-9138-f99709370657
2010-07-16 00:05:52 +00:00
Rafaël Carré
f5c79105a4 mkamsboot: fix for newer fuzev2
These models are restricted to OF >= v02.3.31, probably because of a
hardware change
The OF checks a version string located between 0x0 and 0x200 in the
firmware block, so let's keep this part unmodified

We put our dualboot code at 0x200, and insert a branch + vectors at 0x0
That way our patched file will present the OF version to the fuzev2 OF
patching it, and we only waste 512 bytes on other models

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27441 a1c6a512-1295-4272-9138-f99709370657
2010-07-16 00:00:29 +00:00
Tobias Diedrich
49a3808ddf Remove the unused ENRD0_USB_STATUS define, I'll leave the other button defines in, maybe someone wants his bootloader to use one of those instead ;)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27081 a1c6a512-1295-4272-9138-f99709370657
2010-06-23 07:05:05 +00:00
Tobias Diedrich
7d15c43bd7 Use DBOP to check for left button on C200v2 like we are supposed to instead of right button
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27080 a1c6a512-1295-4272-9138-f99709370657
2010-06-23 07:01:38 +00:00
Tobias Diedrich
470be759e6 Use DBOP to check for left button on C200v2 like we are supposed to instead of right button
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27079 a1c6a512-1295-4272-9138-f99709370657
2010-06-23 06:57:53 +00:00
Rafaël Carré
27d529e186 mkamsboot / nrv2e_d8.S thubm decompressor : comment the use of mov pc, lr
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26449 a1c6a512-1295-4272-9138-f99709370657
2010-06-01 16:53:26 +00:00
Dominik Riebeling
0dcf93ed18 Use build dir and respect TARGET_DIR when building mkamsboot.
libmkamsboot still did put files into its source folder when building for
Rockbox Utility out-of-tree. As with the other libraries use the specified
build folder.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26335 a1c6a512-1295-4272-9138-f99709370657
2010-05-27 17:36:39 +00:00
Rafaël Carré
ff6b0425e4 mkamsboot/rbutil/amsinfo : do not try to detect the model of a given Sansa AMS OF
The field we thought was representative of the model is not, it has
changed in the past for fuzev1 and fuzev2.
For example the value 0x23 is found in 2 old fuzev1 OF versions, and in
the c200v2 OF

The only reliable way to detect the model of a given OF is by using the
built-in list of md5sums.

Modify mkamsboot and rbutilqt to load the rockbox bootloader first, and
then check if the model in the bootloader corresponds to the model of
the known md5sum of the given OF.

That way we can continue to present the user with a list of known OF
versions in case the OF is unknown to mkamsboot

Also explicit the dependency of main.c on mkamsboot.h in case the
prototypes change
Correct the header's description not updated in r21648

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26248 a1c6a512-1295-4272-9138-f99709370657
2010-05-24 10:06:52 +00:00
Rafaël Carré
e2d1eb6fc8 mkamsboot: support Fuzev2 OF 2.03.33
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26230 a1c6a512-1295-4272-9138-f99709370657
2010-05-21 13:13:53 +00:00
Rafaël Carré
d9e508b584 mkamsboot: support Clip+ OF v01.02.15
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26207 a1c6a512-1295-4272-9138-f99709370657
2010-05-20 18:51:49 +00:00
Rafaël Carré
c23a7ccbbc Fuzev2: use enrd0 for USB detection, GPIO didn't work on some models
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26125 a1c6a512-1295-4272-9138-f99709370657
2010-05-18 00:11:42 +00:00
Rafaël Carré
66f183077d Clip+: boot to OF if USB is connected
To be sure that there is no mistake in this code, it is run *after*
the known to work HOME & LEFT buttons checks, unlike other Sansas

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26122 a1c6a512-1295-4272-9138-f99709370657
2010-05-17 21:57:46 +00:00
Marcoen Hirschberg
268f7c42f0 fix mkamsboot compilation on systems where 'make' is not 'GNU make' (FreeBSD for example)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25825 a1c6a512-1295-4272-9138-f99709370657
2010-05-05 10:56:19 +00:00
Rafaël Carré
fdf8e2d1e4 mkamsboot: accept Clip+ OF v01.02.13
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25662 a1c6a512-1295-4272-9138-f99709370657
2010-04-17 12:17:01 +00:00
Rafaël Carré
be920c4fb5 Fix Fuzev2 OF version
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25366 a1c6a512-1295-4272-9138-f99709370657
2010-03-28 02:58:00 +00:00
Rafaël Carré
0d96f9e581 mkamsboot: add fuzev2 OF 2.02.31
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25365 a1c6a512-1295-4272-9138-f99709370657
2010-03-28 02:45:09 +00:00
Rafaël Carré
20fccd8489 mkamsboot: add Clipv2 OF v2.01.35
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25287 a1c6a512-1295-4272-9138-f99709370657
2010-03-22 08:32:04 +00:00
Rafaël Carré
b0e3fc6560 mkamsboot: update README for Clip+/Fuzev2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25218 a1c6a512-1295-4272-9138-f99709370657
2010-03-16 15:24:56 +00:00
Rafaël Carré
a384cdf7e8 mkamsboot: update for Clipv1 OF v01.01.35 (tested)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25213 a1c6a512-1295-4272-9138-f99709370657
2010-03-16 02:11:04 +00:00
Rafaël Carré
1f251ea30d mkamsboot: Use audio master irq_enrd0 usb_status bit instead of gpio on C200V2
FlySpray: FS#11085
Author: Tobias Diedrich

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25088 a1c6a512-1295-4272-9138-f99709370657
2010-03-09 16:29:38 +00:00
Thomas Martitz
5c4659ab29 Correct search&replace error.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25073 a1c6a512-1295-4272-9138-f99709370657
2010-03-08 17:49:06 +00:00