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_lilypad.hex | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

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

diff --git a/bootloaders/optiboot/optiboot_lilypad.hex b/bootloaders/optiboot/optiboot_lilypad.hex
index 9d31a7a..7579286 100644
--- a/bootloaders/optiboot/optiboot_lilypad.hex
+++ b/bootloaders/optiboot/optiboot_lilypad.hex
@@ -1,34 +1,34 @@
-:103E000085E08093810084B714BE81FFE4D08DE00B
-:103E1000DCD0259A519A86E028E13EEF91E030937C
-:103E200085002093840096BBB09BFECF1D9AA89579
-:103E30008150A9F7DD24D394A5E0EA2EF1E1FF2E0D
-:103E4000ABD0813421F481E0D1D083E024C082342E
-:103E500011F484E103C0853419F485E0C7D08AC029
-:103E60008535A1F499D0082F10E01093010200933A
-:103E7000000292D090E0982F8827802B912B880FFA
-:103E8000991F909301028093000273C0863529F434
-:103E900084E0ACD080E071D06DC0843609F043C0BE
-:103EA0008FD0E0910002F091010283E080935700EF
-:103EB000E895C0E0D1E070D08993809102028150F2
-:103EC000809302028823B9F78BD007B600FCFDCFA0
-:103ED0004091000250910102A0E0B1E02C9130E04D
-:103EE00011968C91119790E0982F8827822B932B15
-:103EF0001296FA010C01D0925700E89511244E5FFA
-:103F00005F4FF1E0A038BF0749F7E0910002F09160
-:103F10000102E0925700E89507B600FCFDCFF09251
-:103F20005700E89527C08437B9F44AD059D0E091BA
-:103F30000002F09101023196F0930102E093000239
-:103F40003197E4918E2F19D0809102028150809395
-:103F50000202882361F70EC0853739F441D08EE123
-:103F60000CD084E90AD086E096CF813511F488E040
-:103F70002CD036D080E101D063CF2AE030E08095AC
-:103F8000089410F4599802C0599A000015D014D022
-:103F900086952A95B1F70895A89529E030E04899CB
-:103FA000FECF0AD009D008D08894489908942A9561
-:103FB00011F08795F7CF089598E09A95F1F7089555
-:103FC000EBDFEADF80930202E7CFE0E6F0E098E182
+:103E0000112484B714BE81FFE6D085E08093810041
+:103E100082E08093C00088E18093C10086E08093B7
+:103E2000C20088E08093C4008EE0CFD0259A86E05F
+:103E300028E13EEF91E0309385002093840096BB0B
+:103E4000B09BFECF1D9AA8958150A9F7DD24D3948D
+:103E5000A5E0EA2EF1E1FF2EABD0813421F481E020
+:103E6000C5D083E020C0823411F484E103C08534DE
+:103E700019F485E0BBD091C0853581F499D0082F25
+:103E800010E096D090E0982F8827802B912B880FF8
+:103E9000991F90930102809300027EC0863529F419
+:103EA00084E0A4D080E07CD078C0843609F04EC095
+:103EB00087D0E0910002F091010288E3E030F8073A
+:103EC00018F483E087BFE895C0E0D1E071D0899312
+:103ED000809102028150809302028823B9F7E09119
+:103EE0000002F091010288E3E030F80718F083E067
+:103EF00087BFE89575D007B600FCFDCF4091000262
+:103F000050910102A0E0B1E02C9130E011968C912B
+:103F1000119790E0982F8827822B932B1296FA0105
+:103F20000C01D7BEE89511244E5F5F4FF1E0A03839
+:103F3000BF0751F7E0910002F0910102E7BEE8955A
+:103F400007B600FCFDCFF7BEE89527C08437B9F46B
+:103F500037D046D0E0910002F09101023196F09303
+:103F60000102E09300023197E4918E2F19D08091E5
+:103F70000202815080930202882361F70EC08537C8
+:103F800039F42ED08EE10CD084E90AD086E08BCFB4
+:103F9000813511F488E019D023D080E101D05CCFC5
+:103FA000982F8091C00085FFFCCF9093C6000895A4
+:103FB000A8958091C00087FFFCCF8091C60008952E
+:103FC000F7DFF6DF80930202F3CFE0E6F0E098E15E
 :103FD00090838083089580E0F8DFEE27FF2709941F
-:103FE000DBDF803209F0F7DF84E1C7CF1F93182FA2
-:0C3FF000D3DF1150E9F7F4DF1F910895B2
+:103FE000E7DF803209F0F7DF84E1DACF1F93182F83
+:0C3FF000DFDF1150E9F7F4DF1F910895A6
 :0400000300003E00BB
 :00000001FF
-- 
cgit v1.2.3-18-g5258