Skip to content

Significant optiboot upgrade. #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 10, 2011
Merged

Significant optiboot upgrade. #30

merged 14 commits into from
Oct 10, 2011

Conversation

WestfW
Copy link
Contributor

@WestfW WestfW commented Jun 15, 2011

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 13 commits June 9, 2011 22:36
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.
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
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.
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.
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
(found during atmega8 testing.)
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.))
(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.
@damellis
Copy link
Contributor

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
Copy link
Contributor Author

WestfW commented Jun 17, 2011

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."

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 )
damellis added a commit that referenced this pull request Oct 10, 2011
Significant optiboot upgrade.
@damellis damellis merged commit f093cc6 into arduino:master Oct 10, 2011
@damellis
Copy link
Contributor

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
Copy link
Contributor Author

WestfW commented Oct 10, 2011

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.

OK. You should have been able to do a wholesale replace of the optiboot files; I don't think there have been other edits in the new-extension branch, have there?

Um. How do I do that? http://code.google.com/p/arduino/wiki/GitandGithubGuideforArduinoDevelopment doesn't mention anything about dealing with the multiple branches. Does "new-extension" just replace the occurences of "master"?

BillW

@damellis
Copy link
Contributor

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.

oriregev pushed a commit to oriregev/Arduino that referenced this pull request Dec 20, 2013
Significant optiboot upgrade.
tbowmo pushed a commit to tbowmo/Arduino that referenced this pull request Jul 14, 2016
Implementation of interrupt driven binary switch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants