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_atmega328.hex | 59 +++++++++++++++--------------
 1 file changed, 30 insertions(+), 29 deletions(-)

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

diff --git a/bootloaders/optiboot/optiboot_atmega328.hex b/bootloaders/optiboot/optiboot_atmega328.hex
index e8aa31c..72108ee 100644
--- a/bootloaders/optiboot/optiboot_atmega328.hex
+++ b/bootloaders/optiboot/optiboot_atmega328.hex
@@ -1,33 +1,34 @@
-:107E0000112485E08093810082E08093C00088E1A6
-:107E10008093C10086E08093C20080E18093C4001B
-:107E200084B714BE81FFD0D08DE0C8D0259A86E0FB
+:107E0000112484B714BE81FFE6D085E08093810001
+:107E100082E08093C00088E18093C10086E0809377
+:107E2000C20080E18093C4008EE0CFD0259A86E026
 :107E300020E33CEF91E0309385002093840096BBD3
 :107E4000B09BFECF1D9AA8958150A9F7DD24D3944D
-:107E5000A5E0EA2EF1E1FF2EA4D0813421F481E0E7
-:107E6000BED083E024C0823411F484E103C08534A1
-:107E700019F485E0B4D08AC08535A1F492D0082FDA
-:107E800010E010930102009300028BD090E0982F35
-:107E90008827802B912B880F991F90930102809344
-:107EA000000273C0863529F484E099D080E071D057
-:107EB0006DC0843609F043C07CD0E0910002F0919F
-:107EC000010283E080935700E895C0E0D1E069D0DB
-:107ED0008993809102028150809302028823B9F72E
-:107EE00078D007B600FCFDCF40910002509101020E
-:107EF000A0E0B1E02C9130E011968C91119790E0C8
-:107F0000982F8827822B932B1296FA010C01D0927E
-:107F10005700E89511244E5F5F4FF1E0A038BF078E
-:107F200049F7E0910002F0910102E0925700E895D4
-:107F300007B600FCFDCFF0925700E89527C08437C4
-:107F4000B9F437D046D0E0910002F09101023196A9
-:107F5000F0930102E09300023197E4918E2F19D043
-:107F600080910202815080930202882361F70EC043
-:107F7000853739F42ED08EE10CD085E90AD08FE018
-:107F800096CF813511F488E019D023D080E101D05B
-:107F900063CF982F8091C00085FFFCCF9093C600DF
-:107FA0000895A8958091C00087FFFCCF8091C600FE
-:107FB0000895F7DFF6DF80930202F3CFE0E6F0E00A
-:107FC00098E190838083089580E0F8DFEE27FF2713
-:107FD0000994E7DF803209F0F7DF84E1DACF1F93FD
-:0E7FE000182FDFDF1150E9F7F4DF1F9108952D
+:107E5000A5E0EA2EF1E1FF2EABD0813421F481E0E0
+:107E6000C5D083E020C0823411F484E103C085349E
+:107E700019F485E0BBD091C0853581F499D0082FE5
+:107E800010E096D090E0982F8827802B912B880FB8
+:107E9000991F90930102809300027EC0863529F4D9
+:107EA00084E0A4D080E07CD078C0843609F04EC055
+:107EB00087D0E0910002F091010280E7E030F807FE
+:107EC00018F483E087BFE895C0E0D1E071D08993D2
+:107ED000809102028150809302028823B9F7E091D9
+:107EE0000002F091010280E7E030F80718F083E02B
+:107EF00087BFE89575D007B600FCFDCF4091000222
+:107F000050910102A0E0B1E02C9130E011968C91EB
+:107F1000119790E0982F8827822B932B1296FA01C5
+:107F20000C01D7BEE89511244E5F5F4FF1E0A038F9
+:107F3000BF0751F7E0910002F0910102E7BEE8951A
+:107F400007B600FCFDCFF7BEE89527C08437B9F42B
+:107F500037D046D0E0910002F09101023196F093C3
+:107F60000102E09300023197E4918E2F19D08091A5
+:107F70000202815080930202882361F70EC0853788
+:107F800039F42ED08EE10CD085E90AD08FE08BCF6A
+:107F9000813511F488E019D023D080E101D05CCF85
+:107FA000982F8091C00085FFFCCF9093C600089564
+:107FB000A8958091C00087FFFCCF8091C6000895EE
+:107FC000F7DFF6DF80930202F3CFE0E6F0E098E11E
+:107FD00090838083089580E0F8DFEE27FF270994DF
+:107FE000E7DF803209F0F7DF84E1DACF1F93182F43
+:0C7FF000DFDF1150E9F7F4DF1F91089566
 :0400000300007E007B
 :00000001FF
-- 
cgit v1.2.3-18-g5258