Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Significant optiboot upgrade. #30

Merged
merged 14 commits into from

2 participants

@WestfW

The brings together a bunch of changes that have been in the optiboot repository for a while:
380 optiboot has problems upload sketches bigger than 30 KB?

517 Makefile in the /optiboot directory not functional with avrdude 5.10 / gnu make 3.8.1

556 update optiboot to the point of the latest optiboot project sources.

And some more that I've been experimenting with in my private branch for a while:
487 should be possible to compile optiboot using the Arduino-installed tools.

526 optiboot can start sketchs with inconsistent regster configuration side-effects

554 Optiboot source/binary should include a version number.

555 Optiboot high-value watchdog timeouts are defined incorrectly.
xxx code space savings.
And a couple that are relatively newly implemented:
368 Optiboot does not support ArduinoasISP programmer

yyy Return FW version numbers in response to appropriate commands.

The pre-built list of .hex and .lst files is reduced.

Although there are substantial numbers of changes, very little of the core logic of optiboot has changed.

Tested on m328, m168, m8, some with manual reset, and with ArdunioISP. Mostly on Mac, some on windows xp. Needs more linux testing.

WestfW added some commits
@WestfW WestfW Makefile modification to allow building optiboot in more environments.
Allows building within the Arduino Source tree, and within the Arduino
IDE tree, as well as using CrossPack on Mac.

Adds README.TXT to track arduino-specific changes (and documents the
new build options.)

This addresses Arduino issue:

  http://code.google.com/p/arduino/issues/detail?id=487

And optiboot issue

  http://code.google.com/p/optiboot/issues/detail?id=1

(which can be thought of as a subset of the Arduno issue.)

Note that the binaries produced after these Makefile changes (using any
of the compile environments) are identical to those produced by the
crosspack-20100115 environment on a Mac.
2d2ed32
@WestfW WestfW http://code.google.com/p/arduino/issues/detail?id=517
Remove the trailing comments when setting fuse values for the various
*_isp targets, so that they won't cause avrdude errors.

This was done the same way as in the optiboot source tree:
http://code.google.com/p/optiboot/issues/detail?id=17
http://code.google.com/p/optiboot/source/detail?r=005fb033fc08c551b2f86f7c90c5db21549b3f20
6840b77
@WestfW WestfW This is a relatively significant edit that brings the Arduino copy of
optiboot up-to-date with the optiboot source repository as of Jun-2011
(the last changes made in the optiboot repository were in Oct-2010)

This adds support for several plaforms, fixes the "30k bug", and
refactors the source to have separate stk500.h, boot.h, and pin_defs.h

These are the arduino opticode issues fixed:
http://code.google.com/p/arduino/issues/detail?id=380
    optiboot has problems upload sketches bigger than 30 KB
http://code.google.com/p/arduino/issues/detail?id=556
    update optiboot to the point of the latest optiboot project sources.

These are issues that had been solved in the optiboot source aready:
http://code.google.com/p/arduino/issues/detail?id=364
   optiboot leaves timer1 configured when starting app, breaks PWM on
   pin 9 and 10.  (fixed with a workaround in arduino core.)
   aka http://code.google.com/p/optiboot/source/detail?r=c778fbe72df6ac13ef730c25283358c3c970f73e
   Support for ATmega8 and mega88.
   Fix fuse settings for mega168 _ISP targets
   Additional new platforms (mega, sanguino)

http://code.google.com/p/optiboot/issues/detail?id=26
   Set R1 to 0  (already in arduino code)
http://code.google.com/p/optiboot/issues/detail?id=36&can=1
   Fails to build correctly for mega88

After this commit, the only differences between the Arduino optiboot.c
and the optiboot repository optiboot.c are cosmetic.
e2812ef
@WestfW WestfW Update shell script makeall d4632cb
@WestfW WestfW Add a version number to the optiboot source and binary.
http://code.google.com/p/arduino/issues/detail?id=554

end of flash memory where they can be read (at least in theory) by
device programmers, hex-file examination, or application programs.
This is done by putting the version number in a separate section
(".version"), and using linker/objcopy magic to locate that section as
appropriate for the target chip.  (See
http://lists.gnu.org/archive/html/avr-gcc-list/2011-02/msg00016.html
for some discussion on the details.)

Start the version at 4.1 (the last "packaged" version of optiboot was
called version 3, so the "top of source" would be 4.0, and adding the
version number makes 4.1)

Refactor LDSECTION in the Makefile to LDSECTIONS so that multiple
section start addresses can be defined.

Change the _isp makefile definitions to make the bootloader section
readable (but not writable) by the application section.  (This would
need to be done elsewhere as well to handle all bootloader programming
techniques.  Notably Arduino's boards.txt

Note that this change does not change the "code" portion of optiboot
at all.  The only diffs in the .hex files are the added version word
at the end of flash memory.
0070628
@WestfW WestfW Shrink code by using registers for variables "length" and "address"
http://code.google.com/p/optiboot/issues/detail?id=33

Fix high-value watchdog timeouts on ATmega8
http://code.google.com/p/optiboot/issues/detail?id=38

Change "start app on bad commands" code to start the app via the
watchdog timer, so that the app is always started with the chip
in fully reset state.
http://code.google.com/p/optiboot/issues/detail?id=37
6f7687b
@WestfW WestfW Update version to reflect previous edit. Sigh. e28b716
@WestfW WestfW Fix errors in LDSECTIONS refactoring
(found during atmega8 testing.)
422398e
@WestfW WestfW (make sure .hex and .lst are updated as well.) ece29c3
@WestfW WestfW http://code.google.com/p/arduino/issues/detail?id=368
Optiboot does not support ArduinoasISP programmer.

When avrdude runs and talks to an arduino running ArduinoISP,
it needs the optiboot (entered due to auto-reset) to abort and
start the ArduinoISP "application" when it sees communications
at the wrong serial speed.  Unfortunately, optiboot treats all
unrecognized command characters as "no-ops" and responds/loops
for more commands, leading to a nice loop that never gets to
the sketch.   This patch causes characters received with Framing
errors (the most likely error for speed mis-matches) to NOT
reset the watchdog timer (normally done in getch()), which will
cause the application to start if it continues for "a while."
(tested.  Works!  Running ArduinoISP at speeds as high as 57600
still causes the bootloader to start the sketch (although it fails
later on for other reasons.))
e81c112
@WestfW WestfW Modify Uno "lock" bits in boards.txt to make bootloader readable by 39a4966
@WestfW WestfW Allow the READ PARAMETER command to return our version number.
(significant size impact: 14 bytes!)

Initialized "address" to eliminate compiler warning (4 bytes!)

Add "atmega168" as a more accurate target name than "diecimila"
(keep diecimila as well for backward compatibility)

Reduce the .hex and .lst targets that are stored in source control
to the three basics: atmega8, atmega168, atmega328.  The other
targets remain in the makefile and makeall, but will need to be
built from source if wanted.  Which should be less of a problem
now that the source is buildable without installing crosspack.
7b1ee0f
@WestfW WestfW Oops. Add atmega8.lst/hex and atmega168.lst/hex to controlled files. c56a129
@damellis
Owner

Looks good. I think I should probably until we can do production testing before merging this, as I don't want to do a release of the Arduino software which would burn a different bootloader than the one we're shipping in production. What do you think?

I'll try to get the testing started ASAP.

@WestfW

Do you (does anyone) have any ideas on what to do for "testing"? Optiboot supports such a limited subset of commands (and very little error handling) that it's hard to think of more than "try it with the arduino IDE and see if it works" (for each instance of Arduino IDE), and "see if the bugs that are supposed to be fixed actually seem to be fixed."

@WestfW WestfW Explicitly set the SHELL variable when OS=windows, so that we'll use
the same shell regardless of whether other shells are installed
(different shells have different behavior WRT directory component
separators, so this matters.

http://code.google.com/p/arduino/issues/detail?id=667 )
fc8cacb
@damellis damellis merged commit f093cc6 into from
@damellis
Owner

I think we've finally gone ahead with using this updated optiboot on new boards, so I merged it into the main GitHub repository. BTW, I've been doing development for 1.0 in the new-extension branch, so I manually "cherry-picked" the commits there. As you do future updates, it would easier to merge them if you start from a clean fork of the new-extension branch rather than the (old) master branch.

Thanks for all your work on this! And for your patience with our slow process.

@WestfW
@damellis
Owner

I merged all the optiboot changes into new-extension. You're right that there weren't other changes to merge with, but I wanted to preserve your edit history.

Yes, you should be able to just clone new-extension instead of master and the rest should be the same.

@igrr igrr referenced this pull request from a commit in igrr/Arduino
@igrr igrr Naming changes as suggested in #30
Close #30
e9a0b13
@igrr igrr referenced this pull request from a commit in igrr/Arduino
@igrr igrr Merge remote-tracking branch 'origin/esp8266' into esp8266
* origin/esp8266:
  Naming changes as suggested in #30
27eb7ef
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 10, 2011
  1. @WestfW

    Makefile modification to allow building optiboot in more environments.

    WestfW authored
    Allows building within the Arduino Source tree, and within the Arduino
    IDE tree, as well as using CrossPack on Mac.
    
    Adds README.TXT to track arduino-specific changes (and documents the
    new build options.)
    
    This addresses Arduino issue:
    
      http://code.google.com/p/arduino/issues/detail?id=487
    
    And optiboot issue
    
      http://code.google.com/p/optiboot/issues/detail?id=1
    
    (which can be thought of as a subset of the Arduno issue.)
    
    Note that the binaries produced after these Makefile changes (using any
    of the compile environments) are identical to those produced by the
    crosspack-20100115 environment on a Mac.
  2. @WestfW

    http://code.google.com/p/arduino/issues/detail?id=517

    WestfW authored
    Remove the trailing comments when setting fuse values for the various
    *_isp targets, so that they won't cause avrdude errors.
    
    This was done the same way as in the optiboot source tree:
    http://code.google.com/p/optiboot/issues/detail?id=17
    http://code.google.com/p/optiboot/source/detail?r=005fb033fc08c551b2f86f7c90c5db21549b3f20
  3. @WestfW

    This is a relatively significant edit that brings the Arduino copy of

    WestfW authored
    optiboot up-to-date with the optiboot source repository as of Jun-2011
    (the last changes made in the optiboot repository were in Oct-2010)
    
    This adds support for several plaforms, fixes the "30k bug", and
    refactors the source to have separate stk500.h, boot.h, and pin_defs.h
    
    These are the arduino opticode issues fixed:
    http://code.google.com/p/arduino/issues/detail?id=380
        optiboot has problems upload sketches bigger than 30 KB
    http://code.google.com/p/arduino/issues/detail?id=556
        update optiboot to the point of the latest optiboot project sources.
    
    These are issues that had been solved in the optiboot source aready:
    http://code.google.com/p/arduino/issues/detail?id=364
       optiboot leaves timer1 configured when starting app, breaks PWM on
       pin 9 and 10.  (fixed with a workaround in arduino core.)
       aka http://code.google.com/p/optiboot/source/detail?r=c778fbe72df6ac13ef730c25283358c3c970f73e
       Support for ATmega8 and mega88.
       Fix fuse settings for mega168 _ISP targets
       Additional new platforms (mega, sanguino)
    
    http://code.google.com/p/optiboot/issues/detail?id=26
       Set R1 to 0  (already in arduino code)
    http://code.google.com/p/optiboot/issues/detail?id=36&can=1
       Fails to build correctly for mega88
    
    After this commit, the only differences between the Arduino optiboot.c
    and the optiboot repository optiboot.c are cosmetic.
  4. @WestfW

    Update shell script makeall

    WestfW authored
Commits on Jun 11, 2011
  1. @WestfW

    Add a version number to the optiboot source and binary.

    WestfW authored
    http://code.google.com/p/arduino/issues/detail?id=554
    
    end of flash memory where they can be read (at least in theory) by
    device programmers, hex-file examination, or application programs.
    This is done by putting the version number in a separate section
    (".version"), and using linker/objcopy magic to locate that section as
    appropriate for the target chip.  (See
    http://lists.gnu.org/archive/html/avr-gcc-list/2011-02/msg00016.html
    for some discussion on the details.)
    
    Start the version at 4.1 (the last "packaged" version of optiboot was
    called version 3, so the "top of source" would be 4.0, and adding the
    version number makes 4.1)
    
    Refactor LDSECTION in the Makefile to LDSECTIONS so that multiple
    section start addresses can be defined.
    
    Change the _isp makefile definitions to make the bootloader section
    readable (but not writable) by the application section.  (This would
    need to be done elsewhere as well to handle all bootloader programming
    techniques.  Notably Arduino's boards.txt
    
    Note that this change does not change the "code" portion of optiboot
    at all.  The only diffs in the .hex files are the added version word
    at the end of flash memory.
  2. @WestfW

    Shrink code by using registers for variables "length" and "address"

    WestfW authored
    http://code.google.com/p/optiboot/issues/detail?id=33
    
    Fix high-value watchdog timeouts on ATmega8
    http://code.google.com/p/optiboot/issues/detail?id=38
    
    Change "start app on bad commands" code to start the app via the
    watchdog timer, so that the app is always started with the chip
    in fully reset state.
    http://code.google.com/p/optiboot/issues/detail?id=37
  3. @WestfW
  4. @WestfW

    Fix errors in LDSECTIONS refactoring

    WestfW authored
    (found during atmega8 testing.)
  5. @WestfW
Commits on Jun 14, 2011
  1. @WestfW

    http://code.google.com/p/arduino/issues/detail?id=368

    WestfW authored
    Optiboot does not support ArduinoasISP programmer.
    
    When avrdude runs and talks to an arduino running ArduinoISP,
    it needs the optiboot (entered due to auto-reset) to abort and
    start the ArduinoISP "application" when it sees communications
    at the wrong serial speed.  Unfortunately, optiboot treats all
    unrecognized command characters as "no-ops" and responds/loops
    for more commands, leading to a nice loop that never gets to
    the sketch.   This patch causes characters received with Framing
    errors (the most likely error for speed mis-matches) to NOT
    reset the watchdog timer (normally done in getch()), which will
    cause the application to start if it continues for "a while."
    (tested.  Works!  Running ArduinoISP at speeds as high as 57600
    still causes the bootloader to start the sketch (although it fails
    later on for other reasons.))
  2. @WestfW
  3. @WestfW

    Allow the READ PARAMETER command to return our version number.

    WestfW authored
    (significant size impact: 14 bytes!)
    
    Initialized "address" to eliminate compiler warning (4 bytes!)
    
    Add "atmega168" as a more accurate target name than "diecimila"
    (keep diecimila as well for backward compatibility)
    
    Reduce the .hex and .lst targets that are stored in source control
    to the three basics: atmega8, atmega168, atmega328.  The other
    targets remain in the makefile and makeall, but will need to be
    built from source if wanted.  Which should be less of a problem
    now that the source is buildable without installing crosspack.
Commits on Jun 15, 2011
  1. @WestfW
Commits on Oct 5, 2011
  1. @WestfW

    Explicitly set the SHELL variable when OS=windows, so that we'll use

    WestfW authored
    the same shell regardless of whether other shells are installed
    (different shells have different behavior WRT directory component
    separators, so this matters.
    
    http://code.google.com/p/arduino/issues/detail?id=667 )
Something went wrong with that request. Please try again.