Merge branch 'ide-1.5.x' into lib-1.5

5 files changed, 131 insertions, 65 deletions

diff --git a/bootloaders/atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex b/bootloaders/atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex
new file mode 100644
index 0000000..6190d48
--- /dev/null
+++ b/bootloaders/atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex
@@ -0,0 +1,66 @@
+:101C000012C02BC02AC029C028C027C026C025C0AA

+:101C100024C023C022C021C020C01FC01EC01DC0C0

+:101C20001CC01BC01AC011241FBECFE5D4E0DEBF0C

+:101C3000CDBF10E0A0E6B0E0E8EEFFE102C0059005

+:101C40000D92A236B107D9F711E0A2E6B0E001C0CB

+:101C50001D92AA36B107E1F74FC0D2CFEF92FF92A3

+:101C60000F931F93EE24FF24870113C00894E11CF7

+:101C7000F11C011D111D81E0E81682E1F8068AE7DA

+:101C8000080780E0180728F0E0916200F0916300F7

+:101C900009955F9BEBCF8CB1992787FD90951F919C

+:101CA0000F91FF90EF9008955D9BFECF8CB9089542

+:101CB000D5DF803221F484E1F7DF80E1F5DF08959C

+:101CC0001F93182FCBDF803231F484E1EDDF812FB9

+:101CD000EBDF80E1E9DF1F9108951F93CF93DF933E

+:101CE000182FC0E0D0E002C0B9DF2196C117E0F3A1

+:101CF000DF91CF911F910895CFE5D4E0DEBFCDBF36

+:101D0000000010BC83E389B988E18AB986E880BD08

+:101D1000BD9A1092680130E2E0E0F0E02FE088B375

+:101D2000832788BBCF010197F1F7215027FFF7CF19

+:101D300020E12093680192DF803381F1813399F4AF

+:101D40008DDF8032C1F784E1AFDF81E4ADDF86E56E

+:101D5000ABDF82E5A9DF80E2A7DF89E4A5DF83E5C9

+:101D6000A3DF80E5C7C0803429F478DF8638B0F07F

+:101D700075DF14C0813471F471DF803811F482E0B2

+:101D80001DC1813811F481E019C1823809F015C1F3

+:101D900082E114C1823421F484E19FDF89DFCBCF5B

+:101DA000853411F485E0F9CF8035C1F38135B1F385

+:101DB0008235A1F3853539F451DF809364004EDF1D

+:101DC00080936500EBCF863519F484E086DFF5C09B

+:101DD000843609F093C042DF809367013FDF809330

+:101DE0006601809169018E7F8093690137DF8534B8

+:101DF00029F480916901816080936901C0E0D0E09D

+:101E000006E610E005C02ADFF80181938F012196D4

+:101E10008091660190916701C817D907A0F31EDF72

+:101E2000803209F088CF8091690180FF1FC020E0D7

+:101E300030E0E6E6F0E012C0A0916400B0916500E9

+:101E40008191082EC5D08091640090916500019623

+:101E500090936500809364002F5F3F4F80916601EF

+:101E6000909167012817390738F343C0F894E19936

+:101E7000FECF1127E0916400F0916500EE0FFF1F87

+:101E8000C6E6D0E0809166019091670180FF01C0B5

+:101E90000196103051F422D003E000935700E895EA

+:101EA0001DD001E100935700E8950990199016D0D4

+:101EB00001E000935700E8951395103258F0112770

+:101EC0000DD005E000935700E89508D001E100939C

+:101ED0005700E8953296029739F0DBCF0091570012

+:101EE00001700130D9F30895103011F00296E7CF58

+:101EF000112484E1D9DE80E1D7DE1DCF843709F0DB

+:101F00004BC0ACDE80936701A9DE80936601A6DE3C

+:101F100090916901853421F49160909369010DC01D

+:101F20009E7F909369018091640090916500880F75

+:101F3000991F909365008093640090DE803209F0D1

+:101F4000FACE84E1B1DEC0E0D0E01EC0809169012C

+:101F500080FF07C0A0916400B091650031D0802D52

+:101F600008C081FD07C0E0916400F0916500E49134

+:101F70008E2F9ADE80916400909165000196909377

+:101F800065008093640021968091660190916701BD

+:101F9000C817D907D8F2AFCF853761F45FDE80323A

+:101FA00009F0C9CE84E180DE8EE17EDE83E97CDE4D

+:101FB00087E0A0CF863709F0BECE80E081DEBBCEC1

+:101FC000E199FECFBFBBAEBBE09A11960DB208956A

+:101FD000E199FECFBFBBAEBB0DBA11960FB6F89418

+:081FE000E29AE19A0FBE089598

+:021FE800800077

+:0400000300001C00DD

+:00000001FF

diff --git a/bootloaders/atmega8/ATmegaBOOT.c b/bootloaders/atmega8/ATmegaBOOT.c
index 17977e6..8c8d22a 100644
--- a/bootloaders/atmega8/ATmegaBOOT.c
+++ b/bootloaders/atmega8/ATmegaBOOT.c
@@ -36,7 +36,7 @@
 #include <avr/pgmspace.h>
 #include <avr/eeprom.h>
 #include <avr/interrupt.h>
-#include <avr/delay.h>
+#include <util/delay.h>
 
 //#define F_CPU			16000000
 
diff --git a/bootloaders/atmega8/ATmegaBOOT.hex b/bootloaders/atmega8/ATmegaBOOT.hex
index 6190d48..9182267 100644
--- a/bootloaders/atmega8/ATmegaBOOT.hex
+++ b/bootloaders/atmega8/ATmegaBOOT.hex
@@ -1,66 +1,62 @@
-:101C000012C02BC02AC029C028C027C026C025C0AA

-:101C100024C023C022C021C020C01FC01EC01DC0C0

-:101C20001CC01BC01AC011241FBECFE5D4E0DEBF0C

-:101C3000CDBF10E0A0E6B0E0E8EEFFE102C0059005

+:101C000012C02CC02BC02AC029C028C027C026C0A3

+:101C100025C024C023C022C021C020C01FC01EC0B8

+:101C20001DC01CC01BC011241FBECFE5D4E0DEBF09

+:101C3000CDBF10E0A0E6B0E0E6EAFFE102C005900B

 :101C40000D92A236B107D9F711E0A2E6B0E001C0CB

-:101C50001D92AA36B107E1F74FC0D2CFEF92FF92A3

-:101C60000F931F93EE24FF24870113C00894E11CF7

-:101C7000F11C011D111D81E0E81682E1F8068AE7DA

-:101C8000080780E0180728F0E0916200F0916300F7

-:101C900009955F9BEBCF8CB1992787FD90951F919C

-:101CA0000F91FF90EF9008955D9BFECF8CB9089542

-:101CB000D5DF803221F484E1F7DF80E1F5DF08959C

-:101CC0001F93182FCBDF803231F484E1EDDF812FB9

-:101CD000EBDF80E1E9DF1F9108951F93CF93DF933E

-:101CE000182FC0E0D0E002C0B9DF2196C117E0F3A1

-:101CF000DF91CF911F910895CFE5D4E0DEBFCDBF36

-:101D0000000010BC83E389B988E18AB986E880BD08

-:101D1000BD9A1092680130E2E0E0F0E02FE088B375

-:101D2000832788BBCF010197F1F7215027FFF7CF19

-:101D300020E12093680192DF803381F1813399F4AF

-:101D40008DDF8032C1F784E1AFDF81E4ADDF86E56E

-:101D5000ABDF82E5A9DF80E2A7DF89E4A5DF83E5C9

-:101D6000A3DF80E5C7C0803429F478DF8638B0F07F

-:101D700075DF14C0813471F471DF803811F482E0B2

-:101D80001DC1813811F481E019C1823809F015C1F3

-:101D900082E114C1823421F484E19FDF89DFCBCF5B

-:101DA000853411F485E0F9CF8035C1F38135B1F385

-:101DB0008235A1F3853539F451DF809364004EDF1D

-:101DC00080936500EBCF863519F484E086DFF5C09B

-:101DD000843609F093C042DF809367013FDF809330

-:101DE0006601809169018E7F8093690137DF8534B8

-:101DF00029F480916901816080936901C0E0D0E09D

-:101E000006E610E005C02ADFF80181938F012196D4

-:101E10008091660190916701C817D907A0F31EDF72

-:101E2000803209F088CF8091690180FF1FC020E0D7

-:101E300030E0E6E6F0E012C0A0916400B0916500E9

-:101E40008191082EC5D08091640090916500019623

-:101E500090936500809364002F5F3F4F80916601EF

-:101E6000909167012817390738F343C0F894E19936

-:101E7000FECF1127E0916400F0916500EE0FFF1F87

-:101E8000C6E6D0E0809166019091670180FF01C0B5

-:101E90000196103051F422D003E000935700E895EA

-:101EA0001DD001E100935700E8950990199016D0D4

-:101EB00001E000935700E8951395103258F0112770

-:101EC0000DD005E000935700E89508D001E100939C

-:101ED0005700E8953296029739F0DBCF0091570012

-:101EE00001700130D9F30895103011F00296E7CF58

-:101EF000112484E1D9DE80E1D7DE1DCF843709F0DB

-:101F00004BC0ACDE80936701A9DE80936601A6DE3C

-:101F100090916901853421F49160909369010DC01D

-:101F20009E7F909369018091640090916500880F75

-:101F3000991F909365008093640090DE803209F0D1

-:101F4000FACE84E1B1DEC0E0D0E01EC0809169012C

-:101F500080FF07C0A0916400B091650031D0802D52

-:101F600008C081FD07C0E0916400F0916500E49134

-:101F70008E2F9ADE80916400909165000196909377

-:101F800065008093640021968091660190916701BD

-:101F9000C817D907D8F2AFCF853761F45FDE80323A

-:101FA00009F0C9CE84E180DE8EE17EDE83E97CDE4D

-:101FB00087E0A0CF863709F0BECE80E081DEBBCEC1

-:101FC000E199FECFBFBBAEBBE09A11960DB208956A

-:101FD000E199FECFBFBBAEBB0DBA11960FB6F89418

-:081FE000E29AE19A0FBE089598

-:021FE800800077

+:101C50001D92AA36B107E1F72BD0A3C1D1CF5D9B6E

+:101C6000FECF8CB908955F9BFECF8CB108950F9382

+:101C70001F93082F10E002C0F6DF1F5F1017E0F37C

+:101C80001F910F9108951F93182FEDDF803231F4CB

+:101C900084E1E5DF812FE3DF80E1E1DF1F9108953B

+:101CA000E2DF803221F484E1DADF80E1D8DF0895D9

+:101CB0000F931F93CF93DF93000010BC83E389B988

+:101CC00088E18AB986E880BDBD9A1092680120E05B

+:101CD00030E240E050E007C088B3832788BBCA01E8

+:101CE0000197F1F72F5F2031B8F320936801BBDF34

+:101CF000803381F1813399F4B6DF8032C1F784E11A

+:101D0000AEDF81E4ACDF86E5AADF82E5A8DF80E212

+:101D1000A6DF89E4A4DF83E5A2DF80E523C1803468

+:101D200029F4A1DF8638B0F09EDF14C0813471F44D

+:101D30009ADF803811F482E01DC1813811F481E00E

+:101D400019C1823809F015C182E114C1823421F42D

+:101D500084E18DDFA5DFCBCF853411F485E0F9CFA9

+:101D60008035C1F38135B1F38235A1F3853539F47E

+:101D70007ADF8093640077DF80936500EBCF863550

+:101D800019F484E074DFF5C0843609F090C06BDF8D

+:101D90008093670168DF80936601809169018E7F7F

+:101DA0008093690160DF853429F480916901816045

+:101DB0008093690100E010E007C055DFF801EA599F

+:101DC000FF4F80830F5F1F4F8091660190916701E5

+:101DD0000817190790F347DF803209F088CF809108

+:101DE000690180FF1FC000E010E014C0F801EA594B

+:101DF000FF4F80916400909165006081C5D0809113

+:101E00006400909165000196909365008093640052

+:101E10000F5F1F4F809166019091670108171907A6

+:101E200028F343C0F894E199FECF1127E0916400B4

+:101E3000F0916500EE0FFF1FC6E6D0E080916601CD

+:101E40009091670180FF01C00196103051F422D0BB

+:101E500003E000935700E8951DD001E1009357007F

+:101E6000E8950990199016D001E000935700E89585

+:101E70001395103258F011270DD005E0009357004C

+:101E8000E89508D001E100935700E8953296029753

+:101E900039F0DBCF0091570001700130D9F308957C

+:101EA000103011F00296E7CF112484E15BC0843733

+:101EB00009F04BC0D8DE80936701D5DE80936601C0

+:101EC000D2DE90916901853421F49160909369018B

+:101ED0000DC09E7F90936901809164009091650090

+:101EE000880F991F9093650080936400BCDE803258

+:101EF00009F0FDCE84E1B3DE00E010E01EC0809169

+:101F0000690180FF06C0809164009091650034D023

+:101F100008C081FD07C0E0916400F0916500E49184

+:101F20008E2F9DDE809164009091650001969093C4

+:101F30006500809364000F5F1F4F80916601909150

+:101F4000670108171907D8F20EC0853779F48BDEC0

+:101F5000803209F0CCCE84E182DE8EE180DE83E93E

+:101F60007EDE87E07CDE80E17ADEC1CE863709F056

+:101F7000BECE80E088DEBBCEE199FECF9FBB8EBB9C

+:101F8000E09A99278DB30895262FE199FECF9FBB44

+:101F90008EBB2DBB0FB6F894E29AE19A0FBE019664

+:061FA0000895F894FFCF44

+:021FA6008000B9

 :0400000300001C00DD

 :00000001FF

diff --git a/bootloaders/atmega8/ATmegaBOOT.txt b/bootloaders/atmega8/ATmegaBOOT.txt
new file mode 100644
index 0000000..b0e19b3
--- /dev/null
+++ b/bootloaders/atmega8/ATmegaBOOT.txt
@@ -0,0 +1,4 @@
+Configured with: ../src/configure -v --enable-languages=c,c++ --prefix=/usr/lib --infodir=/usr/share/info --mandir=/usr/share/man --bindir=/usr/bin --libexecdir=/usr/lib --libdir=/usr/lib --enable-shared --with-system-zlib --enable-long-long --enable-nls --without-included-gettext --disable-checking --disable-libssp --build=i686-linux-gnu --host=i686-linux-gnu --target=avr
+Thread model: single
+gcc version 4.3.5 (GCC) 
+
diff --git a/bootloaders/atmega8/Makefile b/bootloaders/atmega8/Makefile
index 8c0edd3..9202b52 100644
--- a/bootloaders/atmega8/Makefile
+++ b/bootloaders/atmega8/Makefile
@@ -26,7 +26,7 @@ ISPFLASH   = $(DIRAVRBIN)/uisp -dpart=ATmega8 $(ISPPARAMS) --erase --upload if=$
 
 
 OBJ        = $(PROGRAM).o
-OPTIMIZE   = -Os
+OPTIMIZE   = -Os -funsigned-char -funsigned-bitfields -fno-inline-small-functions
 
 DEFS       = -DF_CPU=16000000 -DBAUD_RATE=19200
 LIBS       =