From 67f1e949e184491161c91e44bf0393b8b90ab627 Mon Sep 17 00:00:00 2001
From: WestfW <westfw@gmail.com>
Date: Fri, 10 Jun 2011 16:17:13 -0700
Subject: 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.
(cherry picked from commit e2812ef91cc1489527827dcd14c843f3b3244f36)
---
 bootloaders/optiboot/optiboot_luminet.hex | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'bootloaders/optiboot/optiboot_luminet.hex')

diff --git a/bootloaders/optiboot/optiboot_luminet.hex b/bootloaders/optiboot/optiboot_luminet.hex
index 0e51124..3ad3c0a 100644
--- a/bootloaders/optiboot/optiboot_luminet.hex
+++ b/bootloaders/optiboot/optiboot_luminet.hex
@@ -1,42 +1,42 @@
-:101D000085E08EBD84B714BE81FF27D18DE021D13F
-:101D1000D49AD29A86E023EC3FEF91E03DBD2CBDF2
-:101D20009BB9589BFECFCC9AA8958150B9F7CC248B
-:101D3000C39485E0E82E0FE7D02E1EECF12EF0D0F4
-:101D4000813421F481E014D183E024C0823411F481
-:101D500084E103C0853419F485E00AD1CFC085350C
-:101D6000A1F4DED0082F10E01093010200930002CE
-:101D7000D7D090E0982F8827802B912B880F991F20
-:101D80009093010280930002B8C0863529F484E064
-:101D9000EFD080E0B6D0B2C0843609F06EC0D4D0A7
-:101DA000E0910002F091010283E080935700E895F2
-:101DB000C0E0D1E0B5D08993809102028150809338
-:101DC00002028823B9F7CED007B600FCFDCF809180
-:101DD000000290910102892B41F580910001209130
-:101DE000010130E0322F222790E0282B392B30934D
-:101DF00005022093040240910A0180910B0190E0BA
-:101E0000982F882750E0842B952B9093070280937E
-:101E100006022450304020930A01232F33272093B9
-:101E20000B01D0920001F09201014091000250910B
-:101E30000102A0E0B1E02C9130E011968C91119755
-:101E400090E0982F8827822B932B1296FA010C0191
-:101E5000C0925700E89511244E5F5F4FF1E0A03427
-:101E6000BF0749F7E0910002F0910102E0925700AC
-:101E7000E89507B600FCFDCF41C0843789F564D0F2
-:101E800071D0E0910002F0910102309719F4209195
-:101E9000040213C0E130F10519F4209105020DC0D0
-:101EA000EA30F10519F42091060207C0EB30F10584
-:101EB00019F42091070201C02491809100029091B1
-:101EC000010201969093010280930002822F19D0A3
-:101ED00080910202815080930202882391F60EC005
-:101EE000853739F43FD08EE10CD083E90AD08CE0FD
-:101EF00051CF813511F488E02CD034D080E101D06D
-:101F00001ECF2AE030E08095089410F4DA9802C0E1
-:101F1000DA9A000015D014D086952A95B1F7089565
-:101F2000A89529E030E0CB99FECF0AD009D008D09F
-:101F30008894CB9908942A9511F08795F7CF089546
-:101F40009EE09A95F1F70895EBDFEADF80930202B5
-:101F5000E7CF98E191BD81BD089580E0FADFE5E02B
-:101F6000FF270994DDDF803209F0F7DF84E1C9CF74
-:101F70001F93182FD5DF1150E9F7F4DF1F91089553
+:101D0000112484B714BE81FF22D185E08EBD8EE000
+:101D10001AD1D49AD29A86E023EC3FEF91E03DBDF0
+:101D20002CBD9BB9589BFECFCC9AA8958150B9F792
+:101D3000DD24D39485E0C82E0FE7F02E1EECE12EB3
+:101D4000E9D0813421F481E00DD183E020C08234D8
+:101D500011F484E103C0853419F485E003D1C8C0CF
+:101D6000853581F4D7D0082F10E0D4D090E0982F9B
+:101D70008827802B912B880F991F90938101809346
+:101D80008001B5C0863529F484E0ECD080E0B3D082
+:101D9000AFC0843609F06BC0D1D0C0E0D1E0BAD07A
+:101DA0008993809182018150809382018823B9F7C1
+:101DB000E0918001F091810183E087BFE895CCD06C
+:101DC00007B600FCFDCF8091800190918101892BA5
+:101DD00041F5809100012091010130E0322F22274E
+:101DE00090E0282B392B309385012093840140917A
+:101DF00008018091090190E0982F882750E0842BFA
+:101E0000952B909387018093860124503040209336
+:101E10000801232F332720930901F0920001E0925B
+:101E200001014091800150918101A0E0B1E02C912D
+:101E300030E011968C91119790E0982F8827822B93
+:101E4000932B1296FA010C01D7BEE89511244E5F30
+:101E50005F4FF1E0A034BF0751F7E0918001F091AE
+:101E60008101C7BEE89507B600FCFDCF41C08437AD
+:101E700089F564D071D0E0918001F09181013097B3
+:101E800019F42091840113C0E130F10519F4209177
+:101E900085010DC0E830F10519F42091860107C0D5
+:101EA000E930F10519F42091870101C02491809156
+:101EB000800190918101019690938101809380012E
+:101EC000822F19D0809182018150809382018823D2
+:101ED00091F60EC0853739F43FD08EE10CD083E9FE
+:101EE0000AD08CE054CF813511F488E02CD034D066
+:101EF00080E101D025CF2AE030E08095089410F4ED
+:101F0000DA9802C0DA9A000015D014D086952A9586
+:101F1000B1F70895A89529E030E0CB99FECF0AD01B
+:101F200009D008D08894CB9908942A9511F0879508
+:101F3000F7CF08959EE09A95F1F70895EBDFEADF79
+:101F400080938201E7CF98E191BD81BD089580E043
+:101F5000FADFE4E0FF270994DDDF803209F0F7DFE4
+:101F600084E1C9CF1F93182FD5DF1150E9F7F4DFB3
+:041F70001F91089520
 :0400000300001D00DC
 :00000001FF
-- 
cgit v1.2.3-18-g5258