first commitHEADmaster

3 files changed, 1180 insertions, 0 deletions

diff --git a/test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex b/test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex
new file mode 100644
index 0000000..aea378e
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/lilypad/LilyPadBOOT_168.hex
@@ -0,0 +1,117 @@
+:103800000C94341C0C944F1C0C944F1C0C944F1CA7

+:103810000C944F1C0C944F1C0C944F1C0C944F1C7C

+:103820000C944F1C0C944F1C0C944F1C0C944F1C6C

+:103830000C944F1C0C944F1C0C944F1C0C944F1C5C

+:103840000C944F1C0C944F1C0C944F1C0C944F1C4C

+:103850000C944F1C0C944F1C0C944F1C0C944F1C3C

+:103860000C944F1C0C944F1C11241FBECFEFD4E0BE

+:10387000DEBFCDBF11E0A0E0B1E0E8E1FFE302C0B0

+:1038800005900D92A230B107D9F712E0A2E0B1E0A5

+:1038900001C01D92AD30B107E1F70C94311D0C94BD

+:1038A000001CCF93DF93CDB7DEB724970FB6F89403

+:1038B000DEBF0FBECDBF382F882309F433E010924E

+:1038C0000A02332309F44BC020E02D9A19821A8290

+:1038D0001B821C8289819A81AB81BC8180549F416B

+:1038E000A040B040A0F489819A81AB81BC8101964F

+:1038F000A11DB11D89839A83AB83BC8389819A8181

+:10390000AB81BC8180549F41A040B04060F32D98B2

+:1039100019821A821B821C8289819A81AB81BC81A7

+:1039200080549F41A040B040A0F489819A81AB812E

+:10393000BC810196A11DB11D89839A83AB83BC8391

+:1039400089819A81AB81BC8180549F41A040B04065

+:1039500060F32F5F231708F4B8CF20930A02249650

+:103960000FB6F894DEBF0FBECDBFDF91CF910895A3

+:10397000EF92FF920F931F93EE24FF248701809113

+:10398000C00087FD17C00894E11CF11C011D111D2A

+:1039900081E0E81689E0F8068DE3080780E0180763

+:1039A00070F3E0910201F091030109958091C0004C

+:1039B00087FFE9CF8091C600992787FD90951F91D9

+:1039C0000F91FF90EF900895982F8091C00085FF90

+:1039D000FCCF9093C60008950E94B81C803271F00D

+:1039E000809104018F5F80930401853009F0089570

+:1039F000E0910201F09103010995089584E10E948C

+:103A0000E41C80E10E94E41C08951F93182F0E947B

+:103A1000B81C803269F0809104018F5F80930401AB

+:103A2000853079F4E0910201F0910301099509C014

+:103A300084E10E94E41C812F0E94E41C80E10E942A

+:103A4000E41C1F910895282F882351F090E0809165

+:103A5000C00087FFFCCF8091C6009F5F2917B9F790

+:103A60000895CFEFD4E0DEBFCDBF000089E18093A1

+:103A7000C4001092C50088E18093C10086E0809365

+:103A8000C2005098589A259A83E00E94511C0E94C7

+:103A9000B81C8033B1F18133B9F1803409F454C0DA

+:103AA000813409F45AC0823409F469C0853409F4B8

+:103AB0006CC0803531F1813521F1823511F18535C8

+:103AC00009F4B2C0863509F4BAC0843609F463C07B

+:103AD000843709F4BBC0853709F40EC1863709F471

+:103AE0004AC0809104018F5F80930401853079F68C

+:103AF000E0910201F091030109950E94B81C803306

+:103B000051F60E94EC1CC3CF0E94B81C803249F7CA

+:103B100084E10E94E41C81E40E94E41C86E50E948A

+:103B2000E41C82E50E94E41C80E20E94E41C89E41B

+:103B30000E94E41C83E50E94E41C80E50E94E41CD2

+:103B400080E10E94E41CA3CF0E94B81C8638C8F212

+:103B50000E94B81C0E94EC1C9ACF0E94B81C8038AE

+:103B600009F4F7C0813809F4F8C0823809F4F9C0C3

+:103B7000883909F4BDC080E00E94051D88CF84E12A

+:103B80000E94231D0E94EC1C82CF85E00E94231D11

+:103B90000E94EC1C7CCF0E94B81C809309020E94FA

+:103BA000B81C8093080280910C028E7F80930C02D7

+:103BB0000E94B81C853409F4C6C080910802909117

+:103BC0000902892B09F0ADC00E94B81C803209F0AF

+:103BD00088CF80910C0280FFC8C08091080290912C

+:103BE00009020097D1F02091060130910701E8E029

+:103BF000F1E0AC014E0F5F1FF999FECF32BD21BD40

+:103C0000819180BDFA9AF99A2F5F3F4F4E175F0757

+:103C100099F7309307012093060184E10E94E41C88

+:103C200080E10E94E41C33CF0E94B81C80930601FF

+:103C30000E94B81C809307010E94EC1C28CF84E0EE

+:103C40000E94231D80E00E94051D21CF0E94B81C08

+:103C5000809309020E94B81C809308020E94B81C3D

+:103C6000853409F4F4C080910C028E7F80930C029D

+:103C70008091060190910701880F991F9093070189

+:103C8000809306010E94B81C803209F000CF84E1C5

+:103C90000E94E41C2091080230910902211531058F

+:103CA00019F1C0E0D0E0E0910601F09107018091A8

+:103CB0000C0280FFC4C0F999FECFF2BDE1BDF89AB5

+:103CC00080B50E94E41CE0910601F0910701319655

+:103CD000F0930701E0930601209108023091090258

+:103CE0002196C217D30718F380E10E94E41CCFCEBF

+:103CF00083E00E94051DCBCE0E94B81C803209F0E3

+:103D0000F0CE84E10E94E41C8EE10E94E41C84E970

+:103D10000E94E41C86E00E94E41C80E10E94E41CF6

+:103D2000B6CEC0E0D0E008E011E00E94B81CF80177

+:103D300081938F0121968091080290910902C81702

+:103D4000D90798F341CF80910C02816080930C02D7

+:103D500034CF82E00E94051D9ACE81E00E94051DAD

+:103D600096CE80E10E94051D92CE8091070187FDCD

+:103D700080C010920B028091060190910701880F7C

+:103D8000991F90930701809306018091080280FF9C

+:103D900009C080910802909109020196909309024E

+:103DA00080930802F894F999FECF1127E09106015B

+:103DB000F0910701C8E0D1E08091080290910902DA

+:103DC000103091F40091570001700130D9F303E0F5

+:103DD00000935700E8950091570001700130D9F326

+:103DE00001E100935700E895099019900091570060

+:103DF00001700130D9F301E000935700E895139565

+:103E0000103498F011270091570001700130D9F358

+:103E100005E000935700E8950091570001700130CC

+:103E2000D9F301E100935700E8953296029709F023

+:103E3000C7CF103011F00296E5CF1124EECE81FFEE

+:103E40000CC03196F0930701E093060149CF8091B1

+:103E50000C02816080930C0215CF84910E94E41CB7

+:103E60002091080230910902E0910601F0910701CA

+:103E7000E8CF81E080930B027ECF0F931F930E94C7

+:103E8000B81C182F0E94E41C0E94B81C082F0E9426

+:103E9000E41C11362CF0175501363CF0075508C0CC

+:103EA0001033D4F310530136CCF700330CF0005329

+:103EB0001295107F100F812F992787FD90951F91E4

+:103EC0000F9108951F93282F992787FD9095807F44

+:103ED00090709595879595958795959587959595E6

+:103EE00087958A304CF0982F995A822F8F708A309C

+:103EF0004CF0182F195A08C0982F905D822F8F70A0

+:103F00008A30BCF7182F105D892F0E94E41C812F86

+:083F10000E94E41C1F910895BA

+:023F1800800027

+:0400000300003800C1

+:00000001FF

diff --git a/test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c b/test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c
new file mode 100644
index 0000000..915bc57
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/lilypad/src/ATmegaBOOT.c
@@ -0,0 +1,979 @@
+/**********************************************************/
+/* Serial Bootloader for Atmel megaAVR Controllers        */
+/*                                                        */
+/* tested with ATmega8, ATmega128 and ATmega168           */
+/* should work with other mega's, see code for details    */
+/*                                                        */
+/* ATmegaBOOT.c                                           */
+/*                                                        */
+/* 20070626: hacked for Arduino Diecimila (which auto-    */
+/*           resets when a USB connection is made to it)  */
+/*           by D. Mellis                                 */
+/* 20060802: hacked for Arduino by D. Cuartielles         */
+/*           based on a previous hack by D. Mellis        */
+/*           and D. Cuartielles                           */
+/*                                                        */
+/* Monitor and debug functions were added to the original */
+/* code by Dr. Erik Lins, chip45.com. (See below)         */
+/*                                                        */
+/* Thanks to Karl Pitrich for fixing a bootloader pin     */
+/* problem and more informative LED blinking!             */
+/*                                                        */
+/* For the latest version see:                            */
+/* http://www.chip45.com/                                 */
+/*                                                        */
+/* ------------------------------------------------------ */
+/*                                                        */
+/* based on stk500boot.c                                  */
+/* Copyright (c) 2003, Jason P. Kyle                      */
+/* All rights reserved.                                   */
+/* see avr1.org for original file and information         */
+/*                                                        */
+/* This program is free software; you can redistribute it */
+/* and/or modify it under the terms of the GNU General    */
+/* Public License as published by the Free Software       */
+/* Foundation; either version 2 of the License, or        */
+/* (at your option) any later version.                    */
+/*                                                        */
+/* This program is distributed in the hope that it will   */
+/* be useful, but WITHOUT ANY WARRANTY; without even the  */
+/* implied warranty of MERCHANTABILITY or FITNESS FOR A   */
+/* PARTICULAR PURPOSE.  See the GNU General Public        */
+/* License for more details.                              */
+/*                                                        */
+/* You should have received a copy of the GNU General     */
+/* Public License along with this program; if not, write  */
+/* to the Free Software Foundation, Inc.,                 */
+/* 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+/*                                                        */
+/* Licence can be viewed at                               */
+/* http://www.fsf.org/licenses/gpl.txt                    */
+/*                                                        */
+/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
+/* m8515,m8535. ATmega161 has a very small boot block so  */
+/* isn't supported.                                       */
+/*                                                        */
+/* Tested with m168                                       */
+/**********************************************************/
+
+/* $Id$ */
+
+
+/* some includes */
+#include <inttypes.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+
+
+/* the current avr-libc eeprom functions do not support the ATmega168 */
+/* own eeprom write/read functions are used instead */
+#ifndef __AVR_ATmega168__
+#include <avr/eeprom.h>
+#endif
+
+/* Use the F_CPU defined in Makefile */
+
+/* 20060803: hacked by DojoCorp */
+/* 20070626: hacked by David A. Mellis to decrease waiting time for auto-reset */
+/* set the waiting time for the bootloader */
+/* get this from the Makefile instead */
+/* #define MAX_TIME_COUNT (F_CPU>>4) */
+
+/* 20070707: hacked by David A. Mellis - after this many errors give up and launch application */
+#define MAX_ERROR_COUNT 5
+
+/* set the UART baud rate */
+/* 20060803: hacked by DojoCorp */
+//#define BAUD_RATE   115200
+#define BAUD_RATE   19200
+
+
+/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
+/* never allow AVR Studio to do an update !!!! */
+#define HW_VER	 0x02
+#define SW_MAJOR 0x01
+#define SW_MINOR 0x10
+
+
+/* Adjust to suit whatever pin your hardware uses to enter the bootloader */
+/* ATmega128 has two UARTS so two pins are used to enter bootloader and select UART */
+/* BL0... means UART0, BL1... means UART1 */
+#ifdef __AVR_ATmega128__
+#define BL_DDR  DDRF
+#define BL_PORT PORTF
+#define BL_PIN  PINF
+#define BL0     PINF7
+#define BL1     PINF6
+#else
+/* other ATmegas have only one UART, so only one pin is defined to enter bootloader */
+#define BL_DDR  DDRD
+#define BL_PORT PORTD
+#define BL_PIN  PIND
+#define BL      PIND6
+#endif
+
+
+/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
+/* if monitor functions are included, LED goes on after monitor was entered */
+#ifdef __AVR_ATmega128__
+/* Onboard LED is connected to pin PB7 (e.g. Crumb128, PROBOmega128, Savvy128) */
+#define LED_DDR  DDRB
+#define LED_PORT PORTB
+#define LED_PIN  PINB
+#define LED      PINB7
+#else
+/* Onboard LED is connected to pin PB2 (e.g. Crumb8, Crumb168) */
+#define LED_DDR  DDRB
+#define LED_PORT PORTB
+#define LED_PIN  PINB
+/* 20060803: hacked by DojoCorp, LED pin is B5 in Arduino */
+/* #define LED      PINB2 */
+#define LED      PINB5
+#endif
+
+
+/* monitor functions will only be compiled when using ATmega128, due to bootblock size constraints */
+#ifdef __AVR_ATmega128__
+#define MONITOR
+#endif
+
+
+/* define various device id's */
+/* manufacturer byte is always the same */
+#define SIG1	0x1E	// Yep, Atmel is the only manufacturer of AVR micros.  Single source :(
+
+#if defined __AVR_ATmega128__
+#define SIG2	0x97
+#define SIG3	0x02
+#define PAGE_SIZE	0x80U	//128 words
+
+#elif defined __AVR_ATmega64__
+#define SIG2	0x96
+#define SIG3	0x02
+#define PAGE_SIZE	0x80U	//128 words
+
+#elif defined __AVR_ATmega32__
+#define SIG2	0x95
+#define SIG3	0x02
+#define PAGE_SIZE	0x40U	//64 words
+
+#elif defined __AVR_ATmega16__
+#define SIG2	0x94
+#define SIG3	0x03
+#define PAGE_SIZE	0x40U	//64 words
+
+#elif defined __AVR_ATmega8__
+#define SIG2	0x93
+#define SIG3	0x07
+#define PAGE_SIZE	0x20U	//32 words
+
+#elif defined __AVR_ATmega88__
+#define SIG2	0x93
+#define SIG3	0x0a
+#define PAGE_SIZE	0x20U	//32 words
+
+#elif defined __AVR_ATmega168__
+#define SIG2	0x94
+#define SIG3	0x06
+#define PAGE_SIZE	0x40U	//64 words
+
+#elif defined __AVR_ATmega162__
+#define SIG2	0x94
+#define SIG3	0x04
+#define PAGE_SIZE	0x40U	//64 words
+
+#elif defined __AVR_ATmega163__
+#define SIG2	0x94
+#define SIG3	0x02
+#define PAGE_SIZE	0x40U	//64 words
+
+#elif defined __AVR_ATmega169__
+#define SIG2	0x94
+#define SIG3	0x05
+#define PAGE_SIZE	0x40U	//64 words
+
+#elif defined __AVR_ATmega8515__
+#define SIG2	0x93
+#define SIG3	0x06
+#define PAGE_SIZE	0x20U	//32 words
+
+#elif defined __AVR_ATmega8535__
+#define SIG2	0x93
+#define SIG3	0x08
+#define PAGE_SIZE	0x20U	//32 words
+#endif
+
+
+/* function prototypes */
+void putch(char);
+char getch(void);
+void getNch(uint8_t);
+void byte_response(uint8_t);
+void nothing_response(void);
+char gethex(void);
+void puthex(char);
+void flash_led(uint8_t);
+
+/* some variables */
+union address_union {
+    uint16_t word;
+    uint8_t  byte[2];
+} address;
+
+union length_union {
+    uint16_t word;
+    uint8_t  byte[2];
+} length;
+
+struct flags_struct {
+    unsigned eeprom : 1;
+    unsigned rampz  : 1;
+} flags;
+
+uint8_t buff[256];
+uint8_t address_high;
+
+uint8_t pagesz=0x80;
+
+uint8_t i;
+uint8_t bootuart = 0;
+
+uint8_t error_count = 0;
+
+void (*app_start)(void) = 0x0000;
+
+
+/* main program starts here */
+int main(void)
+{
+    uint8_t ch,ch2;
+    uint16_t w;
+
+    asm volatile("nop\n\t");
+
+    /* set pin direction for bootloader pin and enable pullup */
+    /* for ATmega128, two pins need to be initialized */
+#ifdef __AVR_ATmega128__
+    BL_DDR &= ~_BV(BL0);
+    BL_DDR &= ~_BV(BL1);
+    BL_PORT |= _BV(BL0);
+    BL_PORT |= _BV(BL1);
+#else
+    /* We run the bootloader regardless of the state of this pin.  Thus, don't
+    put it in a different state than the other pins.  --DAM, 070709
+    BL_DDR &= ~_BV(BL);
+    BL_PORT |= _BV(BL);
+    */
+#endif
+
+
+#ifdef __AVR_ATmega128__
+    /* check which UART should be used for booting */
+    if(bit_is_clear(BL_PIN, BL0)) {
+      bootuart = 1;
+    }
+    else if(bit_is_clear(BL_PIN, BL1)) {
+      bootuart = 2;
+    }
+#endif
+
+    /* check if flash is programmed already, if not start bootloader anyway */
+    if(pgm_read_byte_near(0x0000) != 0xFF) {
+
+#ifdef __AVR_ATmega128__
+	/* no UART was selected, start application */
+	if(!bootuart) {
+          app_start();
+	}
+#else
+	/* check if bootloader pin is set low */
+	/* we don't start this part neither for the m8, nor m168 */
+	//if(bit_is_set(BL_PIN, BL)) {
+    //      app_start();
+    //    }
+#endif
+    }
+
+#ifdef __AVR_ATmega128__    
+    /* no bootuart was selected, default to uart 0 */
+    if(!bootuart) {
+      bootuart = 1;
+    }
+#endif
+
+
+    /* initialize UART(s) depending on CPU defined */
+#ifdef __AVR_ATmega128__
+    if(bootuart == 1) {
+	UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+	UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+	UCSR0A = 0x00;
+	UCSR0C = 0x06;
+	UCSR0B = _BV(TXEN0)|_BV(RXEN0);
+    }
+    if(bootuart == 2) {
+	UBRR1L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+	UBRR1H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+	UCSR1A = 0x00;
+	UCSR1C = 0x06;
+	UCSR1B = _BV(TXEN1)|_BV(RXEN1);
+    }
+#elif defined __AVR_ATmega163__
+    UBRR = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+    UBRRHI = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+    UCSRA = 0x00;
+    UCSRB = _BV(TXEN)|_BV(RXEN);	
+#elif defined __AVR_ATmega168__
+    UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+    UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+    UCSR0B = (1<<RXEN0) | (1<<TXEN0);
+    UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
+
+    /* Enable internal pull-up resistor on pin D0 (RX), in order
+    to supress line noise that prevents the bootloader from
+    timing out (DAM: 20070509) */
+    DDRD &= ~_BV(PIND0);
+    PORTD |= _BV(PIND0);
+#elif defined __AVR_ATmega8__
+  /* m8 */
+  UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; 	// set baud rate
+  UBRRL = (((F_CPU/BAUD_RATE)/16)-1);
+  UCSRB = (1<<RXEN)|(1<<TXEN);  // enable Rx & Tx
+  UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0);  // config USART; 8N1
+#else
+    /* m16,m32,m169,m8515,m8535 */
+    UBRRL = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
+    UBRRH = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
+    UCSRA = 0x00;
+    UCSRC = 0x06;
+    UCSRB = _BV(TXEN)|_BV(RXEN);
+#endif
+
+    /* set LED pin as output */
+    LED_DDR |= _BV(LED);
+
+
+    /* flash onboard LED to signal entering of bootloader */
+#ifdef __AVR_ATmega128__
+    // 4x for UART0, 5x for UART1
+    flash_led(NUM_LED_FLASHES + bootuart);
+#else
+    flash_led(NUM_LED_FLASHES);
+#endif
+    
+    /* 20050803: by DojoCorp, this is one of the parts provoking the
+                 system to stop listening, cancelled from the original */
+    //putch('\0');
+
+
+    /* forever loop */
+    for (;;) {
+
+	/* get character from UART */
+	ch = getch();
+
+	/* A bunch of if...else if... gives smaller code than switch...case ! */
+
+	/* Hello is anyone home ? */ 
+	if(ch=='0') {
+	    nothing_response();
+	}
+
+
+	/* Request programmer ID */
+	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry  */
+	/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares.  */
+	else if(ch=='1') {
+	    if (getch() == ' ') {
+		putch(0x14);
+		putch('A');
+		putch('V');
+		putch('R');
+		putch(' ');
+		putch('I');
+		putch('S');
+		putch('P');
+		putch(0x10);
+	    } else {
+		if (++error_count == MAX_ERROR_COUNT)
+		    app_start();
+	    }
+	}
+
+
+	/* AVR ISP/STK500 board commands  DON'T CARE so default nothing_response */
+	else if(ch=='@') {
+	    ch2 = getch();
+	    if (ch2>0x85) getch();
+	    nothing_response();
+	}
+
+
+	/* AVR ISP/STK500 board requests */
+	else if(ch=='A') {
+	    ch2 = getch();
+	    if(ch2==0x80) byte_response(HW_VER);		// Hardware version
+	    else if(ch2==0x81) byte_response(SW_MAJOR);	// Software major version
+	    else if(ch2==0x82) byte_response(SW_MINOR);	// Software minor version
+	    else if(ch2==0x98) byte_response(0x03);		// Unknown but seems to be required by avr studio 3.56
+	    else byte_response(0x00);				// Covers various unnecessary responses we don't care about
+	}
+
+
+	/* Device Parameters  DON'T CARE, DEVICE IS FIXED  */
+	else if(ch=='B') {
+	    getNch(20);
+	    nothing_response();
+	}
+
+
+	/* Parallel programming stuff  DON'T CARE  */
+	else if(ch=='E') {
+	    getNch(5);
+	    nothing_response();
+	}
+
+
+	/* Enter programming mode  */
+	else if(ch=='P') {
+	    nothing_response();
+	}
+
+
+	/* Leave programming mode  */
+	else if(ch=='Q') {
+	    nothing_response();
+	}
+
+
+	/* Erase device, don't care as we will erase one page at a time anyway.  */
+	else if(ch=='R') {
+	    nothing_response();
+	}
+
+
+	/* Set address, little endian. EEPROM in bytes, FLASH in words  */
+	/* Perhaps extra address bytes may be added in future to support > 128kB FLASH.  */
+	/* This might explain why little endian was used here, big endian used everywhere else.  */
+	else if(ch=='U') {
+	    address.byte[0] = getch();
+	    address.byte[1] = getch();
+	    nothing_response();
+	}
+
+
+	/* Universal SPI programming command, disabled.  Would be used for fuses and lock bits.  */
+	else if(ch=='V') {
+	    getNch(4);
+	    byte_response(0x00);
+	}
+
+
+	/* Write memory, length is big endian and is in bytes  */
+	else if(ch=='d') {
+	    length.byte[1] = getch();
+	    length.byte[0] = getch();
+	    flags.eeprom = 0;
+	    if (getch() == 'E') flags.eeprom = 1;
+	    for (w=0;w<length.word;w++) {
+		buff[w] = getch();	                        // Store data in buffer, can't keep up with serial data stream whilst programming pages
+	    }
+	    if (getch() == ' ') {
+		if (flags.eeprom) {		                //Write to EEPROM one byte at a time
+		    for(w=0;w<length.word;w++) {
+#ifdef __AVR_ATmega168__
+			while(EECR & (1<<EEPE));
+			EEAR = (uint16_t)(void *)address.word;
+			EEDR = buff[w];
+			EECR |= (1<<EEMPE);
+			EECR |= (1<<EEPE);
+#else
+			eeprom_write_byte((void *)address.word,buff[w]);
+#endif
+			address.word++;
+		    }			
+		}
+		else {					        //Write to FLASH one page at a time
+		    if (address.byte[1]>127) address_high = 0x01;	//Only possible with m128, m256 will need 3rd address byte. FIXME
+		    else address_high = 0x00;
+#ifdef __AVR_ATmega128__
+		    RAMPZ = address_high;
+#endif
+		    address.word = address.word << 1;	        //address * 2 -> byte location
+		    /* if ((length.byte[0] & 0x01) == 0x01) length.word++;	//Even up an odd number of bytes */
+		    if ((length.byte[0] & 0x01)) length.word++;	//Even up an odd number of bytes
+		    cli();					//Disable interrupts, just to be sure
+			// HACKME: EEPE used to be EEWE
+		    while(bit_is_set(EECR,EEPE));			//Wait for previous EEPROM writes to complete
+		    asm volatile(
+				 "clr	r17		\n\t"	//page_word_count
+				 "lds	r30,address	\n\t"	//Address of FLASH location (in bytes)
+				 "lds	r31,address+1	\n\t"
+				 "ldi	r28,lo8(buff)	\n\t"	//Start of buffer array in RAM
+				 "ldi	r29,hi8(buff)	\n\t"
+				 "lds	r24,length	\n\t"	//Length of data to be written (in bytes)
+				 "lds	r25,length+1	\n\t"
+				 "length_loop:		\n\t"	//Main loop, repeat for number of words in block							 							 
+				 "cpi	r17,0x00	\n\t"	//If page_word_count=0 then erase page
+				 "brne	no_page_erase	\n\t"						 
+				 "wait_spm1:		\n\t"
+				 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
+				 "andi	r16,1           \n\t"
+				 "cpi	r16,1           \n\t"
+				 "breq	wait_spm1       \n\t"
+				 "ldi	r16,0x03	\n\t"	//Erase page pointed to by Z
+				 "sts	%0,r16		\n\t"
+				 "spm			\n\t"							 
+#ifdef __AVR_ATmega163__
+				 ".word 0xFFFF		\n\t"
+				 "nop			\n\t"
+#endif
+				 "wait_spm2:		\n\t"
+				 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
+				 "andi	r16,1           \n\t"
+				 "cpi	r16,1           \n\t"
+				 "breq	wait_spm2       \n\t"									 
+
+				 "ldi	r16,0x11	\n\t"	//Re-enable RWW section
+				 "sts	%0,r16		\n\t"						 			 
+				 "spm			\n\t"
+#ifdef __AVR_ATmega163__
+				 ".word 0xFFFF		\n\t"
+				 "nop			\n\t"
+#endif
+				 "no_page_erase:		\n\t"							 
+				 "ld	r0,Y+		\n\t"	//Write 2 bytes into page buffer
+				 "ld	r1,Y+		\n\t"							 
+							 
+				 "wait_spm3:		\n\t"
+				 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
+				 "andi	r16,1           \n\t"
+				 "cpi	r16,1           \n\t"
+				 "breq	wait_spm3       \n\t"
+				 "ldi	r16,0x01	\n\t"	//Load r0,r1 into FLASH page buffer
+				 "sts	%0,r16		\n\t"
+				 "spm			\n\t"
+							 
+				 "inc	r17		\n\t"	//page_word_count++
+				 "cpi r17,%1	        \n\t"
+				 "brlo	same_page	\n\t"	//Still same page in FLASH
+				 "write_page:		\n\t"
+				 "clr	r17		\n\t"	//New page, write current one first
+				 "wait_spm4:		\n\t"
+				 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
+				 "andi	r16,1           \n\t"
+				 "cpi	r16,1           \n\t"
+				 "breq	wait_spm4       \n\t"
+#ifdef __AVR_ATmega163__
+				 "andi	r30,0x80	\n\t"	// m163 requires Z6:Z1 to be zero during page write
+#endif							 							 
+				 "ldi	r16,0x05	\n\t"	//Write page pointed to by Z
+				 "sts	%0,r16		\n\t"
+				 "spm			\n\t"
+#ifdef __AVR_ATmega163__
+				 ".word 0xFFFF		\n\t"
+				 "nop			\n\t"
+				 "ori	r30,0x7E	\n\t"	// recover Z6:Z1 state after page write (had to be zero during write)
+#endif
+				 "wait_spm5:		\n\t"
+				 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
+				 "andi	r16,1           \n\t"
+				 "cpi	r16,1           \n\t"
+				 "breq	wait_spm5       \n\t"									 
+				 "ldi	r16,0x11	\n\t"	//Re-enable RWW section
+				 "sts	%0,r16		\n\t"						 			 
+				 "spm			\n\t"					 		 
+#ifdef __AVR_ATmega163__
+				 ".word 0xFFFF		\n\t"
+				 "nop			\n\t"
+#endif
+				 "same_page:		\n\t"							 
+				 "adiw	r30,2		\n\t"	//Next word in FLASH
+				 "sbiw	r24,2		\n\t"	//length-2
+				 "breq	final_write	\n\t"	//Finished
+				 "rjmp	length_loop	\n\t"
+				 "final_write:		\n\t"
+				 "cpi	r17,0		\n\t"
+				 "breq	block_done	\n\t"
+				 "adiw	r24,2		\n\t"	//length+2, fool above check on length after short page write
+				 "rjmp	write_page	\n\t"
+				 "block_done:		\n\t"
+				 "clr	__zero_reg__	\n\t"	//restore zero register
+#if defined __AVR_ATmega168__
+				 : "=m" (SPMCSR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#else
+				 : "=m" (SPMCR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
+#endif
+				 );
+		    /* Should really add a wait for RWW section to be enabled, don't actually need it since we never */
+		    /* exit the bootloader without a power cycle anyhow */
+		}
+		putch(0x14);
+		putch(0x10);
+	    } else {
+		if (++error_count == MAX_ERROR_COUNT)
+		    app_start();
+	    }		
+	}
+    
+
+        /* Read memory block mode, length is big endian.  */
+        else if(ch=='t') {
+	    length.byte[1] = getch();
+	    length.byte[0] = getch();
+#if defined __AVR_ATmega128__
+	    if (address.word>0x7FFF) flags.rampz = 1;		// No go with m256, FIXME
+	    else flags.rampz = 0;
+#endif
+	    if (getch() == 'E') flags.eeprom = 1;
+	    else {
+		flags.eeprom = 0;
+		address.word = address.word << 1;	        // address * 2 -> byte location
+	    }
+	    if (getch() == ' ') {		                // Command terminator
+		putch(0x14);
+		for (w=0;w < length.word;w++) {		        // Can handle odd and even lengths okay
+		    if (flags.eeprom) {	                        // Byte access EEPROM read
+#ifdef __AVR_ATmega168__
+			while(EECR & (1<<EEPE));
+			EEAR = (uint16_t)(void *)address.word;
+			EECR |= (1<<EERE);
+			putch(EEDR);
+#else
+			putch(eeprom_read_byte((void *)address.word));
+#endif
+			address.word++;
+		    }
+		    else {
+
+			if (!flags.rampz) putch(pgm_read_byte_near(address.word));
+#if defined __AVR_ATmega128__
+			else putch(pgm_read_byte_far(address.word + 0x10000));
+			// Hmmmm, yuck  FIXME when m256 arrvies
+#endif
+			address.word++;
+		    }
+		}
+		putch(0x10);
+	    }
+	}
+
+
+        /* Get device signature bytes  */
+        else if(ch=='u') {
+	    if (getch() == ' ') {
+		putch(0x14);
+		putch(SIG1);
+		putch(SIG2);
+		putch(SIG3);
+		putch(0x10);
+	    } else {
+		if (++error_count == MAX_ERROR_COUNT)
+		    app_start();
+	    }
+	}
+
+
+        /* Read oscillator calibration byte */
+        else if(ch=='v') {
+	    byte_response(0x00);
+	}
+
+
+#ifdef MONITOR
+
+	/* here come the extended monitor commands by Erik Lins */
+
+	/* check for three times exclamation mark pressed */
+	else if(ch=='!') {
+	    ch = getch();
+	    if(ch=='!') {
+		ch = getch();
+		if(ch=='!') {
+
+#ifdef __AVR_ATmega128__
+		    uint16_t extaddr;
+#endif
+		    uint8_t addrl, addrh;
+
+#ifdef CRUMB128
+		    PGM_P welcome = {"ATmegaBOOT / Crumb128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#elif defined PROBOMEGA128
+		    PGM_P welcome = {"ATmegaBOOT / PROBOmega128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#elif defined SAVVY128
+		    PGM_P welcome = {"ATmegaBOOT / Savvy128 - (C) J.P.Kyle, E.Lins - 050815\n\r"};
+#endif
+
+		    /* turn on LED */
+		    LED_DDR |= _BV(LED);
+		    LED_PORT &= ~_BV(LED);
+
+		    /* print a welcome message and command overview */
+		    for(i=0; welcome[i] != '\0'; ++i) {
+			putch(welcome[i]);
+		    }
+
+		    /* test for valid commands */
+		    for(;;) {
+			putch('\n');
+			putch('\r');
+			putch(':');
+			putch(' ');
+
+			ch = getch();
+			putch(ch);
+
+			/* toggle LED */
+			if(ch == 't') {
+			    if(bit_is_set(LED_PIN,LED)) {
+				LED_PORT &= ~_BV(LED);
+				putch('1');
+			    } else {
+				LED_PORT |= _BV(LED);
+				putch('0');
+			    }
+
+			} 
+
+			/* read byte from address */
+			else if(ch == 'r') {
+			    ch = getch(); putch(ch);
+			    addrh = gethex();
+			    addrl = gethex();
+			    putch('=');
+			    ch = *(uint8_t *)((addrh << 8) + addrl);
+			    puthex(ch);
+			}
+
+			/* write a byte to address  */
+			else if(ch == 'w') {
+			    ch = getch(); putch(ch);
+			    addrh = gethex();
+			    addrl = gethex();
+			    ch = getch(); putch(ch);
+			    ch = gethex();
+			    *(uint8_t *)((addrh << 8) + addrl) = ch;
+
+			}
+
+			/* read from uart and echo back */
+			else if(ch == 'u') {
+			    for(;;) {
+				putch(getch());
+			    }
+			}
+#ifdef __AVR_ATmega128__
+			/* external bus loop  */
+			else if(ch == 'b') {
+			    putch('b');
+			    putch('u');
+			    putch('s');
+			    MCUCR = 0x80;
+			    XMCRA = 0;
+			    XMCRB = 0;
+			    extaddr = 0x1100;
+			    for(;;) {
+				ch = *(volatile uint8_t *)extaddr;
+				if(++extaddr == 0) {
+				    extaddr = 0x1100;
+				}
+			    }
+			}
+#endif
+
+			else if(ch == 'j') {
+			    app_start();
+			}
+
+		    }
+		    /* end of monitor functions */
+
+		}
+	    }
+	}
+	/* end of monitor */
+#endif
+	else if (++error_count == MAX_ERROR_COUNT) {
+	    app_start();
+	}
+    }
+    /* end of forever loop */
+
+}
+
+
+char gethex(void) {
+    char ah,al;
+
+    ah = getch(); putch(ah);
+    al = getch(); putch(al);
+    if(ah >= 'a') {
+	ah = ah - 'a' + 0x0a;
+    } else if(ah >= '0') {
+	ah -= '0';
+    }
+    if(al >= 'a') {
+	al = al - 'a' + 0x0a;
+    } else if(al >= '0') {
+	al -= '0';
+    }
+    return (ah << 4) + al;
+}
+
+
+void puthex(char ch) {
+    char ah,al;
+
+    ah = (ch & 0xf0) >> 4;
+    if(ah >= 0x0a) {
+	ah = ah - 0x0a + 'a';
+    } else {
+	ah += '0';
+    }
+    al = (ch & 0x0f);
+    if(al >= 0x0a) {
+	al = al - 0x0a + 'a';
+    } else {
+	al += '0';
+    }
+    putch(ah);
+    putch(al);
+}
+
+
+void putch(char ch)
+{
+#ifdef __AVR_ATmega128__
+    if(bootuart == 1) {
+	while (!(UCSR0A & _BV(UDRE0)));
+	UDR0 = ch;
+    }
+    else if (bootuart == 2) {
+	while (!(UCSR1A & _BV(UDRE1)));
+	UDR1 = ch;
+    }
+#elif defined __AVR_ATmega168__
+    while (!(UCSR0A & _BV(UDRE0)));
+    UDR0 = ch;
+#else
+    /* m8,16,32,169,8515,8535,163 */
+    while (!(UCSRA & _BV(UDRE)));
+    UDR = ch;
+#endif
+}
+
+
+char getch(void)
+{
+#ifdef __AVR_ATmega128__
+    if(bootuart == 1) {
+	while(!(UCSR0A & _BV(RXC0)));
+	return UDR0;
+    }
+    else if(bootuart == 2) {
+	while(!(UCSR1A & _BV(RXC1)));
+	return UDR1;
+    }
+    return 0;
+#elif defined __AVR_ATmega168__
+    uint32_t count = 0;
+    while(!(UCSR0A & _BV(RXC0))){
+    	/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+    	/* HACKME:: here is a good place to count times*/
+    	count++;
+    	if (count > MAX_TIME_COUNT)
+    		app_start();
+     }
+    return UDR0;
+#else
+    /* m8,16,32,169,8515,8535,163 */
+    uint32_t count = 0;
+    while(!(UCSRA & _BV(RXC))){
+    	/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+    	/* HACKME:: here is a good place to count times*/
+    	count++;
+    	if (count > MAX_TIME_COUNT)
+    		app_start();
+     }
+    return UDR;
+#endif
+}
+
+
+void getNch(uint8_t count)
+{
+    uint8_t i;
+    for(i=0;i<count;i++) {
+#ifdef __AVR_ATmega128__
+	if(bootuart == 1) {
+	    while(!(UCSR0A & _BV(RXC0)));
+	    UDR0;
+	} 
+	else if(bootuart == 2) {
+	    while(!(UCSR1A & _BV(RXC1)));
+	    UDR1;
+	}
+#elif defined __AVR_ATmega168__
+	while(!(UCSR0A & _BV(RXC0)));
+	UDR0;
+#else
+	/* m8,16,32,169,8515,8535,163 */
+   	/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+	//while(!(UCSRA & _BV(RXC)));
+	//UDR;
+    uint8_t i;
+    for(i=0;i<count;i++) {
+    	getch(); // need to handle time out
+    }
+#endif		
+    }
+}
+
+
+void byte_response(uint8_t val)
+{
+    if (getch() == ' ') {
+	putch(0x14);
+	putch(val);
+	putch(0x10);
+    } else {
+	if (++error_count == MAX_ERROR_COUNT)
+	    app_start();
+    }
+}
+
+
+void nothing_response(void)
+{
+    if (getch() == ' ') {
+	putch(0x14);
+	putch(0x10);
+    } else {
+	if (++error_count == MAX_ERROR_COUNT)
+	    app_start();
+    }
+}
+
+void flash_led(uint8_t count)
+{
+    /* flash onboard LED three times to signal entering of bootloader */
+	/* l needs to be volatile or the delay loops below might get
+	optimized away if compiling with optimizations (DAM). */
+    volatile uint32_t l;
+
+    if (count == 0) {
+      count = 3;
+    }
+    
+    for (i = 0; i < count; ++i) {
+	LED_PORT |= _BV(LED);
+	for(l = 0; l < (F_CPU / 1000); ++l);
+	LED_PORT &= ~_BV(LED);
+	for(l = 0; l < (F_CPU / 1000); ++l);
+    }
+}
+
+
+/* end of file ATmegaBOOT.c */
diff --git a/test/ardmake/hardware/bootloaders/lilypad/src/Makefile b/test/ardmake/hardware/bootloaders/lilypad/src/Makefile
new file mode 100644
index 0000000..516d5b2
--- /dev/null
+++ b/test/ardmake/hardware/bootloaders/lilypad/src/Makefile
@@ -0,0 +1,84 @@
+# Makefile for ATmegaBOOT
+# E.Lins, 18.7.2005
+# $Id$
+
+# Instructions
+#
+# To build the bootloader for the LilyPad:
+# make lily
+
+
+# program name should not be changed...
+PROGRAM    = ATmegaBOOT_168
+
+# enter the target CPU frequency
+AVR_FREQ   = 8000000L
+
+# enter the parameters for the avrdude isp tool
+ISPTOOL	   = stk500v2
+ISPPORT	   = usb
+ISPSPEED   = -b 115200
+
+MCU_TARGET = atmega168
+LDSECTION  = --section-start=.text=0x3800
+
+# the efuse should really be 0xf8; since, however, only the lower
+# three bits of that byte are used on the atmega168, avrdude gets
+# confused if you specify 1's for the higher bits, see:
+# http://tinker.it/now/2007/02/24/the-tale-of-avrdude-atmega168-and-extended-bits-fuses/
+#
+# similarly, the lock bits should be 0xff instead of 0x3f (to
+# unlock the bootloader section) and 0xcf instead of 0x0f (to
+# lock it), but since the high two bits of the lock byte are
+# unused, avrdude would get confused.
+ISPFUSES    = avrdude -c $(ISPTOOL) -p m168 -P $(ISPPORT) $(ISPSPEED) -e -u -U lock:w:0x3f:m -U efuse:w:0x00:m -U hfuse:w:0xdd:m -U lfuse:w:0xff:m
+ISPFLASH    = avrdude -c $(ISPTOOL) -p m168 -P $(ISPPORT) $(ISPSPEED) -U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x0f:m
+
+
+OBJ        = $(PROGRAM).o
+OPTIMIZE   = -O2
+
+DEFS       = 
+LIBS       =
+
+CC         = avr-gcc
+
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS        = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
+override LDFLAGS       = -Wl,$(LDSECTION)
+#override LDFLAGS       = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
+
+OBJCOPY        = avr-objcopy
+OBJDUMP        = avr-objdump
+
+all:
+
+lily: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>1' '-DNUM_LED_FLASHES=3'
+lily: $(PROGRAM).hex
+
+$(PROGRAM).hex: $(PROGRAM).elf
+	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+	
+$(PROGRAM).elf: $(OBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+	
+$(OBJ): 
+	avr-gcc $(CFLAGS) $(LDFLAGS) -c -g -O2 -Wall -mmcu=atmega168 ATmegaBOOT.c -o ATmegaBOOT_168.o
+
+%.lst: %.elf
+	$(OBJDUMP) -h -S $< > $@
+
+%.srec: %.elf
+	$(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+	$(OBJCOPY) -j .text -j .data -O binary $< $@
+
+clean:
+	rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
+	
+install:
+	avrdude -p m168 -c stk500v2 -P /dev/cu.USA19H1b1P1.1 -e -u -U lock:w:0x3f:m -U efuse:w:0x00:m -U hfuse:w:0xdd:m -U lfuse:w:0xe2:m 
+	avrdude -p m168 -c stk500v2 -P /dev/cu.USA19H1b1P1.1 -e -u -U flash:w:ATmegaBOOT_168.hex  -U lock:w:0x0f:m