Commit graph

37 commits

Author SHA1 Message Date
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
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
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é
3b53fe0485 mkamsboot: make sure files depending on dualboot.h are updated
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24915 a1c6a512-1295-4272-9138-f99709370657
2010-02-25 18:08:16 +00:00
Rafaël Carré
c36a644cc6 mkamsboot: use version.sh properly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24843 a1c6a512-1295-4272-9138-f99709370657
2010-02-22 05:41:09 +00:00
Björn Stenberg
b4f6c6ffba Tweaked dependencies a bit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24770 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 08:09:41 +00:00
Rafaël Carré
75919d5f3d Revert r24763 : LIBOBJS is already included in OBJS
The problem seems related to dependency on a directory

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24765 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:16:51 +00:00
Rafaël Carré
a63b225a14 mkamsboot binary depends on the same object files than libmkamsboot
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24763 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:05:39 +00:00
Dominik Riebeling
69a5ff7f8a Make lipo calls silent.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23982 a1c6a512-1295-4272-9138-f99709370657
2009-12-13 21:30:28 +00:00
Dominik Riebeling
d587794dfc Remove special lib Makefile targets that aren't used anymore.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23871 a1c6a512-1295-4272-9138-f99709370657
2009-12-06 10:19:39 +00:00
Dominik Riebeling
f0d0ba86ff Fix building universal binaries.
When building various libraries for Rockbox Utility make sure they use the same compiler as Qt. Pass Qt's CC instead of explicitly setting it. This fixes issues linking on OS X (with recent XCode building universal binaries requires the use of gcc-4-0 while the default one is 4.2).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23779 a1c6a512-1295-4272-9138-f99709370657
2009-11-28 22:39:05 +00:00
Dominik Riebeling
cca6f747f8 Handle TARGET_DIR in universal library building.
Building universal libraries needs to take TARGET_DIR into account as when set the individual libraries are placed into the build output folder and didn't got found anymore.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23778 a1c6a512-1295-4272-9138-f99709370657
2009-11-28 22:39:00 +00:00
Rafaël Carré
a721007e39 mkamsboot: fix linking (typo from r23520)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23571 a1c6a512-1295-4272-9138-f99709370657
2009-11-08 21:00:55 +00:00
Dominik Riebeling
d47366bb78 Remove unused variable.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23523 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 21:57:28 +00:00
Dominik Riebeling
ea6178065c Clean up mkamsboot building. No functional changes.
- split out standalone functions to a separate file.
- adjust and clean up Makefile.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23520 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 20:58:40 +00:00
Dominik Riebeling
606a333a5f Fix building of Rockbox Utility by restoring object list for libmkamsboot.a
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23505 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 22:05:35 +00:00
Tomer Shalev
15ea6e663f FS#10741 - rbutil: Fix mkamsboot Makefile dependancies
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23443 a1c6a512-1295-4272-9138-f99709370657
2009-10-31 17:18:17 +00:00
Dave Chapman
747b9ca258 mkamsboot: allow the version string to be overridden from the commandline - e.g. "make APPVERSION=v1.1 mkamsboot".
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23097 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 09:47:15 +00:00
Rafaël Carré
30ea0b6368 mkamsboot: build and package (dmg) an universal OSX binary
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23034 a1c6a512-1295-4272-9138-f99709370657
2009-10-09 08:49:41 +00:00
Dominik Riebeling
32b367b042 Don't warn if the archive has to be created.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23013 a1c6a512-1295-4272-9138-f99709370657
2009-10-08 20:10:03 +00:00
Dominik Riebeling
2417023652 Make mkamsboot Makefile operate silent per default.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22629 a1c6a512-1295-4272-9138-f99709370657
2009-09-05 08:54:52 +00:00
Dominik Wenger
4d86861ce5 rbutil: modify buildsystem so you can build outside of the rbutilqt directoy. (similar to the normal buildsystem). Attention: Spaces in the path will cause errors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22624 a1c6a512-1295-4272-9138-f99709370657
2009-09-04 21:31:17 +00:00
Dominik Riebeling
4dd44bffb0 Explicitly set CC to prevent make trying to use cc instead. Fixes build issues on w32.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22623 a1c6a512-1295-4272-9138-f99709370657
2009-09-04 19:54:18 +00:00
Dominik Riebeling
ac77c08f11 Make mkamsboot Makefile more silent.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22320 a1c6a512-1295-4272-9138-f99709370657
2009-08-15 14:26:08 +00:00
Dominik Wenger
f4e2d83f04 mkamsboot: move intermediate files into a build directory and allow building of a universal lib (for macs)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22318 a1c6a512-1295-4272-9138-f99709370657
2009-08-15 13:54:13 +00:00
Thomas Martitz
ff2f839c39 Change to versioning for mkamsboot to <rXXXXX>-<DATE> for svn builds. A fixed number like 1.1 can (and should) be used for releases.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21652 a1c6a512-1295-4272-9138-f99709370657
2009-07-05 10:35:47 +00:00
Rafaël Carré
96165abec2 FS#10253 : mkamsboot v1.0
- Bump version to 1.0
- Add Clipv2 target
- Make mkamsboot work as a library (work by domonoky : FS#10185, with a few modifications by me)
  . Use a macro with variadic arguments for error cases in functions which might error.
  . Add detailed descriptions to functions exported by the library (in the header file)
- modify bin2c.c to produce only one pair of .c/.h files with several files embedded in it
- move files needing to be built by an ARM cross compiler into dualboot/
- commit produced .c/.h files (containing nrv2e_d8.S and dualboot.S built for Clip, Fuze, e200v2, c200v2, m200v4, Clipv2)
- Write a real README file
- cosmetics: indent dualboot.S properly, remove trailing spaces, limit lines to 80 characters
- comments: add/correct comments in dualboot.S and mkamsboot.c
- move back extract_fw.c to utils/AMS/hacking

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21118 a1c6a512-1295-4272-9138-f99709370657
2009-05-28 18:27:08 +00:00
Michael Giacomelli
68e24d3a16 Commit updated mkamsboot for c200v2 patching. Tested and seems to be working using USB for dualboot.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19575 a1c6a512-1295-4272-9138-f99709370657
2008-12-24 04:23:52 +00:00
Dave Chapman
dcb0e43148 Clean up the Makefile a little - no functional changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19106 a1c6a512-1295-4272-9138-f99709370657
2008-11-14 22:16:22 +00:00
Daniel Stenberg
044ba22b93 "mv m200v2 m200v4"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19060 a1c6a512-1295-4272-9138-f99709370657
2008-11-10 09:27:40 +00:00
Rafaël Carré
29a5373724 mkamsboot: supports Fuze firmwares
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18936 a1c6a512-1295-4272-9138-f99709370657
2008-10-30 20:00:56 +00:00
Dave Chapman
c91d7873c7 Add MD5 checksumming of the original firmware images - for extra safety, and also because some Fuze firmwares have the same ID (or what we thought was the ID) as the M200 firmwares. Plus a few minor cleanups.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18927 a1c6a512-1295-4272-9138-f99709370657
2008-10-30 00:13:29 +00:00
Rafaël Carré
a5a2f12f0a mkamsboot: Fix makefile rules for e200v2 and m200v2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18898 a1c6a512-1295-4272-9138-f99709370657
2008-10-28 11:24:24 +00:00
Dominik Wenger
415c46ed54 add sansa m200v2 support to mkamsboot.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18840 a1c6a512-1295-4272-9138-f99709370657
2008-10-19 19:51:42 +00:00
Dave Chapman
1c4bcfac69 Major rework of mkamsboot, extending work done by Rafael Carre. We now build one "dualboot.bin" mini-bootloader per target and embed it in the mkamsboot binary. The user of mkamsboot just needs to provide an original firmware file, and a Rockbox bootloader file. This code currently supports just the Clip (hardware revision 1) and the E200v2 - button checks are needed for the other V2 targets. NOTE: This is completely untested on-target, and may brick your device.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18767 a1c6a512-1295-4272-9138-f99709370657
2008-10-11 11:35:59 +00:00
Dave Chapman
c6be818212 Move mkamsboot into the rbutil/mkamsboot/ directory - no other changes, so this should still work the same as before.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18706 a1c6a512-1295-4272-9138-f99709370657
2008-10-04 08:46:03 +00:00