SuccessChanges

Summary

  1. MPU spells: some names could not be identified (fixed)
  2. QEMU tests: call mtools_setup.sh rather than duplicating its work (fixes some tests failing if mtools is configured to use lowercase by default)
  3. run_canon_fw.sh: on Mac, bring QEMU window to foreground (by default, the window is opened behind the terminal, so one may not even notice it)
  4. run_canon_fw.sh: print camera name in QEMU window title
  5. run_canon_fw.sh: only clear the terminal if running in interactive mode https://serverfault.com/questions/146745/how-can-i-check-in-bash-if-a-shell-is-running-in-interactive-mode
  6. QEMU logging: always log unmapped memory regions
  7. GDB scripts: fix text alignment with "native" logging options (minor)
  8. QEMU install.sh: fix null byte warning when parsing model list (bash 4.4 and newer? http://www.magiclantern.fm/forum/index.php?topic=2864.msg193118#msg193118 )
  9. QEMU install: print fewer help details after installation; link to the online documentation
  10. QEMU readme: formatting, typos
  11. QEMU readme: more info regarding custom SD/CF images
  12. QEMU readme: more ways to install ML to the virtual SD/CF images
  13. QEMU readme: note about "make install_qemu" not available in all branches
  14. QEMU readme: note about models using a serial flash
  15. QEMU README: minor updates to 050a3cc
  16. Merged unified into qemu
  17. Merged in makefile-updates (pull request #873) Makefile updates to use any valid ARM toolchain
  18. Makefile: fix 7D build_fir
  19. Makefile: fix building Lua with gcc 4.7.3
  20. Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory (some platforms may not have have one - 7D_MASTER, new ports)
  21. Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF (backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
  22. Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203) for consistency with other platforms, including 7D2 to build the regular FIR: make build_fir to build the installer FIR: make ML-SETUP.FIR -B
  23. Makefile: FIR building updates - always install ML-SETUP.FIR (zip, install, install_qemu) - build_fir for regular ML (not installer) now gives AUTOEXEC.FIR - to recompile ML-SETUP.FIR: "make ML-SETUP.FIR -B" from platform directory - "make zip" will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR (just to make sure the source code changes do not interfere with building the installer)
  24. Makefile: fix building xor_chk from its own directory
  25. Makefile: more .NOTPARALLEL fixes
  26. Makefile: fix 7D FIR path (just for consistency)
  27. Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules ML platforms/modules are built sequentially, but within each platform/module, parallel build is used to be tested on Mac with -j8 (on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)
  28. Makefile: fix README.rst generation with POSIX shells to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
  29. Makefile: serialize "make install", fix some related dependencies parallel copying could lock up WIFI_SD cards to reproduce: "WIFI_SD=y make install ML_MODULES=" from platform/CAM directory
  30. Makefile: monitor wifi connection when using WIFI_SD=y (experimental, helps troubleshooting connectivity issues)
  31. Makefile: minor refactors for WIFI_SD (coding style) also fixed a typo
  32. Modules: better error handling for missing rst2html http://www.magiclantern.fm/forum/index.php?topic=17099
  33. Makefile: speed optimizations - helper to evaluate only once, only if used - modules hgstamp: only evaluate if used - CF_CARD, VERSION: only evaluate once if used - PWD is special? renamed to avoid unneeded shell calls Profiling tips: - perf record make; perf report --sort comm - make SHELL="sh -x" - make clean SHELL="sh -x" |& grep "^+" | sort | uniq -c
  34. Makefile: enable parallel compilation for modules, but compile them sequentially huge modules like Lua will compile much faster compiling everything in parallel is not 100% safe (some dependency checks may fail)
  35. Makefile: do not print toolchain info on recursive calls
  36. Makefile: reworked global targets install: doesn't make sense, as we no longer have a "one size fits all" build capable of running on all models (alternative: 5D3.113_install, 60D_install etc) zip: build zip for each camera model, sequentially (parallel build still used within each zip) all: similar to zip (build camera models sequentially, but use parallel compilation within each platform) clean, check: these can run in parallel (no restrictions)
  37. Makefile: fix module dependency checking on "make zip" by default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn't matter which one) when using "make zip", we only want to include the modules compatible with current camera model, without considering other models (fixme: not the cleanest way to implement this)
  38. Makefile: fix module_strings dependency rule (previously, there was an error with make -j)
  39. Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES note: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES to compile without modules: make 5D3 ML_MODULES=
  40. Makefile: fix "make clean" from modules directory with stale modules from other branches https://bitbucket.org/hudson/magic-lantern/pull-requests/873/makefile-updates-to-use-any-valid-arm/diff#comment-48250675
  41. Makefile: fix running from other directory e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
  42. Makefile: model-specific install targets for the root directory examples: make 500D_install; make 500D_install_qemu
  43. 7D: fix compiling with FEATURE_VIDEO_HACKS
  44. Makefile: fix building 7D_MASTER
  45. disable ASSERT for 7D_MASTER
  46. Feature matrix: updated links
  47. Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876) Add 6D.116 to sf_dump module
  48. Added 6D.116 to sf_dump module.
  49. Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877) 600D audio meters fix
  50. 600D also needs Audio IC turned on at boot.
Changeset 16534:46f2e6e1cbb0 by alex@thinkpad:
MPU spells: some names could not be identified (fixed)
The file was modifiedcontrib/qemu/eos/mpu_spells/known_spells.h (diff)
Changeset 16533:d01f900607a8 by alex@thinkpad:
QEMU tests: call mtools_setup.sh rather than duplicating its work<br>(fixes some tests failing if mtools is configured to use lowercase by default)
The file was modifiedcontrib/qemu/tests/run_tests.sh (diff)
Changeset 16532:741aec24597e by alex@thinkpad:
run_canon_fw.sh: on Mac, bring QEMU window to foreground<br>(by default, the window is opened behind the terminal, so one may not even notice it)
The file was modifiedcontrib/qemu/scripts/run_canon_fw.sh (diff)
Changeset 16531:e84ed9e23efe by alex@thinkpad:
run_canon_fw.sh: print camera name in QEMU window title
The file was modifiedcontrib/qemu/scripts/run_canon_fw.sh (diff)
Changeset 16530:2eea98e0c13f by alex@thinkpad:
run_canon_fw.sh: only clear the terminal if running in interactive mode<br>https://serverfault.com/questions/146745/how-can-i-check-in-bash-if-a-shell-is-running-in-interactive-mode
The file was modifiedcontrib/qemu/scripts/run_canon_fw.sh (diff)
Changeset 16529:c47039fc32b7 by alex@thinkpad:
QEMU logging: always log unmapped memory regions
The file was modifiedcontrib/qemu/eos/dbi/logging.c (diff)
Changeset 16528:7a9bd49955e1 by alex@thinkpad:
GDB scripts: fix text alignment with &quot;native&quot; logging options (minor)
The file was modifiedcontrib/qemu/scripts/debug-logging.gdb (diff)
Changeset 16527:b3b129e40780 by alex@thinkpad:
QEMU install.sh: fix null byte warning when parsing model list<br>(bash 4.4 and newer? http://www.magiclantern.fm/forum/index.php?topic=2864.msg193118#msg193118 )
The file was modifiedcontrib/qemu/install.sh (diff)
Changeset 16526:6e86e2b587a2 by alex@thinkpad:
QEMU install: print fewer help details after installation; link to the online documentation
The file was modifiedcontrib/qemu/install.sh (diff)
Changeset 16525:1297b507ce79 by alex@thinkpad:
QEMU readme: formatting, typos
The file was modifiedcontrib/qemu/README.rst (diff)
Changeset 16524:1e4f1a6ac012 by alex@thinkpad:
QEMU readme: more info regarding custom SD/CF images
The file was modifiedcontrib/qemu/README.rst (diff)
Changeset 16523:dd3e675c7207 by alex@thinkpad:
QEMU readme: more ways to install ML to the virtual SD/CF images
The file was modifiedcontrib/qemu/README.rst (diff)
Changeset 16522:bc84c8579aa8 by alex@thinkpad:
QEMU readme: note about &quot;make install_qemu&quot; not available in all branches
The file was modifiedcontrib/qemu/README.rst (diff)
Changeset 16521:6fd16a7ce0d9 by alex@thinkpad:
QEMU readme: note about models using a serial flash
The file was modifiedcontrib/qemu/README.rst (diff)
Changeset 16520:1ffbae037a44 by alex@thinkpad:
QEMU README: minor updates to 050a3cc
The file was modifiedcontrib/qemu/README.rst (diff)
Changeset 16519:61ab0d269199 by alex@thinkpad:
Merged unified into qemu
Changeset 16518:82126d84f311 by alex@thinkpad:
Merged in makefile-updates (pull request #873)<br><br>Makefile updates to use any valid ARM toolchain
Changeset 16517:6cef1ea3d9bf by alex@thinkpad:
Makefile: fix 7D build_fir
The file was modifiedplatform/7D.203/Makefile (diff)
Changeset 16516:52bccf5762ee by alex@thinkpad:
Makefile: fix building Lua with gcc 4.7.3
The file was modifiedsrc/Makefile.src.config (diff)
Changeset 16515:a28936719d11 by alex@thinkpad:
Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory<br>(some platforms may not have have one - 7D_MASTER, new ports)
The file was modifiedplatform/Makefile.platform.extras (diff)
Changeset 16514:5b81f34b425a by alex@thinkpad:
Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF<br>(backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
The file was modifiedplatform/7D.203/consts.h (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/installer.c (diff)
Changeset 16513:1d98a0736cb8 by alex@thinkpad:
Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203)<br>for consistency with other platforms, including 7D2<br>to build the regular FIR: make build_fir<br>to build the installer FIR: make ML-SETUP.FIR -B
The file was modifiedplatform/7D.203/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16512:f8beef0ca833 by alex@thinkpad:
Makefile: FIR building updates<br>- always install ML-SETUP.FIR (zip, install, install_qemu)<br>- build_fir for regular ML (not installer) now gives AUTOEXEC.FIR<br>- to recompile ML-SETUP.FIR: &quot;make ML-SETUP.FIR -B&quot; from platform directory<br>- &quot;make zip&quot; will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR<br>&nbsp; (just to make sure the source code changes do not interfere with building the installer)
The file was modifiedMakefile.inc (diff)
The file was modifiedMakefile.top (diff)
The file was modifiedplatform/Makefile.platform.base (diff)
The file was modifiedplatform/Makefile.platform.extras (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16511:47f3108811c3 by alex@thinkpad:
Makefile: fix building xor_chk from its own directory
The file was modifiedbuild_tools/Makefile (diff)
Changeset 16510:59a6d0a40c7f by alex@thinkpad:
Makefile: more .NOTPARALLEL fixes
The file was modifiedMakefile (diff)
The file was modifiedinstaller/Makefile (diff)
Changeset 16509:5249a4ab74fa by alex@thinkpad:
Makefile: fix 7D FIR path<br>(just for consistency)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16508:2c627b19c8df by alex@thinkpad:
Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules<br>ML platforms/modules are built sequentially, but within each platform/module, parallel build is used<br>to be tested on Mac with -j8<br>(on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)
The file was modifiedMakefile (diff)
The file was modifiedmodules/Makefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16507:36d3ec245c1f by alex@thinkpad:
Makefile: fix README.rst generation with POSIX shells<br>to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
The file was modifiedmodules/Makefile.modules (diff)
Changeset 16506:01953d31029b by alex@thinkpad:
Makefile: serialize &quot;make install&quot;, fix some related dependencies<br>parallel copying could lock up WIFI_SD cards<br>to reproduce: &quot;WIFI_SD=y make install ML_MODULES=&quot; from platform/CAM directory
The file was modifiedMakefile.inc (diff)
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 16505:e592e31c3b41 by alex@thinkpad:
Makefile: monitor wifi connection when using WIFI_SD=y<br>(experimental, helps troubleshooting connectivity issues)
The file was modifiedMakefile.user.default (diff)
Changeset 16504:84d6ed453e7a by alex@thinkpad:
Makefile: minor refactors for WIFI_SD (coding style)<br>also fixed a typo
The file was modifiedMakefile.user.default (diff)
Changeset 16503:26fe70cea745 by alex@thinkpad:
Modules: better error handling for missing rst2html<br>http://www.magiclantern.fm/forum/index.php?topic=17099
The file was modifiedmodules/Makefile.modules (diff)
The file was modifiedmodules/readme2modulestrings.py (diff)
Changeset 16502:5ea430b1fb60 by alex@thinkpad:
Makefile: speed optimizations<br>- helper to evaluate only once, only if used<br>- modules hgstamp: only evaluate if used<br>- CF_CARD, VERSION: only evaluate once if used<br>- PWD is special? renamed to avoid unneeded shell calls<br>Profiling tips:<br>- perf record make; perf report --sort comm<br>- make SHELL=&quot;sh -x&quot;<br>- make clean SHELL=&quot;sh -x&quot; |&amp; grep &quot;^+&quot; | sort | uniq -c
The file was modifiedMakefile.inc (diff)
The file was modifiedMakefile.top (diff)
The file was modifiedMakefile.user.default (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 16501:f2ed3dc0790a by alex@thinkpad:
Makefile: enable parallel compilation for modules, but compile them sequentially<br>huge modules like Lua will compile much faster<br>compiling everything in parallel is not 100% safe (some dependency checks may fail)
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 16500:4d93c8f7bca3 by alex@thinkpad:
Makefile: do not print toolchain info on recursive calls
The file was modifiedMakefile.setup.toolchain (diff)
Changeset 16499:d20616702840 by alex@thinkpad:
Makefile: reworked global targets<br>install: doesn&#039;t make sense, as we no longer have a &quot;one size fits all&quot; build capable of running on all models<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (alternative: 5D3.113_install, 60D_install etc)<br>zip: build zip for each camera model, sequentially (parallel build still used within each zip)<br>all: similar to zip (build camera models sequentially, but use parallel compilation within each platform)<br>clean, check: these can run in parallel (no restrictions)
The file was modifiedMakefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16498:aa050618c27f by alex@thinkpad:
Makefile: fix module dependency checking on &quot;make zip&quot;<br>by default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn&#039;t matter which one)<br>when using &quot;make zip&quot;, we only want to include the modules compatible with current camera model, without considering other models<br>(fixme: not the cleanest way to implement this)
The file was modifiedMakefile.inc (diff)
Changeset 16497:718e285e224d by alex@thinkpad:
Makefile: fix module_strings dependency rule<br>(previously, there was an error with make -j)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 16496:2db4026d348a by alex@thinkpad:
Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES<br>note: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES<br>to compile without modules: make 5D3 ML_MODULES=
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules.default (diff)
Changeset 16495:ff1401e9fc1c by alex@thinkpad:
Makefile: fix &quot;make clean&quot; from modules directory with stale modules from other branches<br>https://bitbucket.org/hudson/magic-lantern/pull-requests/873/makefile-updates-to-use-any-valid-arm/diff#comment-48250675
The file was modifiedmodules/Makefile (diff)
Changeset 16494:3ca10bd65cbf by alex@thinkpad:
Makefile: fix running from other directory<br>e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
The file was modifiedMakefile (diff)
Changeset 16493:919971999199 by alex@thinkpad:
Makefile: model-specific install targets for the root directory<br>examples: make 500D_install; make 500D_install_qemu
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16492:871f759a2ada by alex@thinkpad:
7D: fix compiling with FEATURE_VIDEO_HACKS
The file was modifiedsrc/ml_rpc.h (diff)
Changeset 16491:6a08a65fe077 by alex@thinkpad:
Makefile: fix building 7D_MASTER
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 16440:dcc15836c1f3 by g3gg0:
disable ASSERT for 7D_MASTER
The file was modifiedsrc/dryos.h (diff)
Changeset 16439:a494258984e1 by alex@thinkpad:
Feature matrix: updated links
The file was modifiedfeatures/features-html.py (diff)
Changeset 16438:3f85e3402fe5 by Alex <broscutamaker@gmail.com>:
Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876)<br><br>Add 6D.116 to sf_dump module
Changeset 16437:c326fdc91130 by Daniel Fort <dan@digiola.com>:
Added 6D.116 to sf_dump module.
The file was modifiedmodules/sf_dump/sf_dump.c (diff)
Changeset 16436:75a085c2d38c by Alex <broscutamaker@gmail.com>:
Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877)<br><br>600D audio meters fix
Changeset 16435:c82a97f50486 by Daniel Fort <dan@digiola.com>:
600D also needs Audio IC turned on at boot.
The file was modifiedsrc/audio-common.c (diff)