diff options
author | Jenna Fox <a@creativepony.com> | 2012-09-27 01:39:34 +1000 |
---|---|---|
committer | Jenna Fox <a@creativepony.com> | 2012-09-27 01:39:34 +1000 |
commit | 97b381f5d755080539776e59ba5e6887092cad41 (patch) | |
tree | c8c72bc8085fcbd043fefa3845780f677e7c4ab5 /firmware/main.map | |
parent | 070eab5ba108ae53d999d0366e16224b89ac0c2b (diff) | |
download | micronucleus-97b381f5d755080539776e59ba5e6887092cad41.tar.gz micronucleus-97b381f5d755080539776e59ba5e6887092cad41.tar.bz2 micronucleus-97b381f5d755080539776e59ba5e6887092cad41.zip |
Fixed severe bug in microboot.rb where final 64 byte chunk of user program wouldn't upload correctly
Diffstat (limited to 'firmware/main.map')
-rw-r--r-- | firmware/main.map | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/firmware/main.map b/firmware/main.map index eb790ae..1ea886b 100644 --- a/firmware/main.map +++ b/firmware/main.map @@ -158,7 +158,7 @@ LOAD /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a .rela.plt *(.rela.plt) -.text 0x00001780 0x846 +.text 0x00001780 0x84e *(.vectors) .vectors 0x00001780 0x1e /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/../../../../avr/lib/avr25/crttn85.o 0x00001780 __vectors @@ -239,17 +239,17 @@ LOAD /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a 0x00001830 usbCrc16Append 0x0000185e __vector_2 0x00001838 usbMeasureFrameLength - .text 0x00001b1a 0x42a main.o + .text 0x00001b1a 0x432 main.o 0x00001bce main - .text 0x00001f44 0x7e libs-device/osccal.o - 0x00001f44 calibrateOscillator - 0x00001fc2 . = ALIGN (0x2) + .text 0x00001f4c 0x7e libs-device/osccal.o + 0x00001f4c calibrateOscillator + 0x00001fca . = ALIGN (0x2) *(.text.*) - 0x00001fc2 . = ALIGN (0x2) + 0x00001fca . = ALIGN (0x2) *(.fini9) - .fini9 0x00001fc2 0x0 /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a(_exit.o) - 0x00001fc2 exit - 0x00001fc2 _exit + .fini9 0x00001fca 0x0 /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a(_exit.o) + 0x00001fca exit + 0x00001fca _exit *(.fini9) *(.fini8) *(.fini8) @@ -268,11 +268,11 @@ LOAD /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a *(.fini1) *(.fini1) *(.fini0) - .fini0 0x00001fc2 0x4 /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a(_exit.o) + .fini0 0x00001fca 0x4 /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a(_exit.o) *(.fini0) - 0x00001fc6 _etext = . + 0x00001fce _etext = . -.data 0x00800060 0x6 load address 0x00001fc6 +.data 0x00800060 0x6 load address 0x00001fce 0x00800060 PROVIDE (__data_start, .) *(.data) .data 0x00800060 0x6 main.o @@ -303,8 +303,8 @@ LOAD /usr/local/CrossPack-AVR-20100115/lib/gcc/avr/4.3.3/avr25/libgcc.a 0x00800084 usbConfiguration 0x00800085 usbRxBuf 0x0080009b PROVIDE (__bss_end, .) - 0x00001fc6 __data_load_start = LOADADDR (.data) - 0x00001fcc __data_load_end = (__data_load_start + SIZEOF (.data)) + 0x00001fce __data_load_start = LOADADDR (.data) + 0x00001fd4 __data_load_end = (__data_load_start + SIZEOF (.data)) .noinit 0x0080009b 0x0 0x0080009b PROVIDE (__noinit_start, .) |