Merge.

Merge branch 'master' of https://github.com/Optiboot/optiboot

optiboot/bootloaders/optiboot/Makefile.isp

@@ -72,7 +72,7 @@ ISPFUSES =	-e -u -U lock:w:0x$(LOCKFUSE):m $(EFUSE_CMD) \
 # space from accidental SPM writes.  Note: "2f" allows boot section to be read
 # by the application, which is different than the arduino default.
 #
-ISPFLASH =	-U flash:w:$(FILENAME) -U lock:w:$(LOCKFUSE):m
+ISPFLASH =	-U flash:w:$(FILENAME) -U lock:w:0x$(LOCKFUSE):m
 
 # There are certain complicated caused by the fact that the default state
 # of a fuse is a "1" rather than a "0", especially with respect to fuse bits

optiboot/bootloaders/optiboot/optiboot.c

@@ -905,7 +905,7 @@ int main(void) {
 
 #if SOFT_UART
   /* Set TX pin as HIGH output */
-  UART_PIN |= _BV(UART_TX_BIT);
+  UART_PORT |= _BV(UART_TX_BIT);
   UART_DDR |= _BV(UART_TX_BIT);
 #endif
 

optiboot/bootloaders/optiboot/pin_defs.h

@@ -106,6 +106,7 @@
   #define UDR0          UDR
   #define UDRE0         UDRE
   #define RXC0          RXC
+  #define TXC0          TXC
   #define FE0           FE
   #define TIFR1         TIFR
   #define WDTCSR        WDTCR