Merged nuttx/arch/master into atmega2560

arch/avr/include/atmega/irq.h

@@ -239,4 +239,3 @@ extern "C"
 #endif
 
 #endif /* __ARCH_AVR_INCLUDE_ATMEGA_IRQ_H */
-

arch/avr/include/avr/irq.h

@@ -204,4 +204,3 @@ extern "C"
 #endif
 
 #endif /* __ARCH_AVR_INCLUDE_AVR_IRQ_H */
-

arch/avr/src/Makefile

@@ -183,4 +183,3 @@ endif
 	$(call DELFILE, .depend)
 
 -include Make.dep
-

arch/avr/src/atmega/Kconfig

@@ -39,7 +39,6 @@ config AVR_USART1
 
 endmenu # ATMega Peripheral Selections
 
-
 menu "Low level UART driver options"
 	depends on AVR_USART0 || AVR_USART1
 
@@ -54,4 +53,3 @@ config SERIAL_TERMIOS
 
 endmenu
 endif
-

arch/avr/src/atmega/atmega_lowinit.c

@@ -155,5 +155,3 @@ void up_lowinit(void)
 
   atmega_boardinitialize();
 }
-
-

arch/avr/src/avr/Toolchain.defs

@@ -124,5 +124,3 @@ ifeq ($(CONFIG_AVR_TOOLCHAIN),WINAVR)
   MAXOPTIMIZATION ?= -O2
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-
-

arch/avr/src/avr/excptmacros.h

@@ -401,6 +401,7 @@
 	adiw	r26, 2					/* Two registers: r24-r25 */
 
 	/* Save the return address that we have saved in r18:19*/
+
 #if ATMEGA_PC_SIZE > 16
 	st		x+, r20
 #endif /* ATMEGA_PC_SIZE */

arch/avr/src/avr/up_dumpstate.c

@@ -158,9 +158,9 @@ static inline void up_registerdump(void)
             current_regs[REG_SREG]);
 #else
       lldbg("PC:  %02x%02x%02x  SP: %02x%02x SREG: %02x\n",
-            current_regs[REG_PC0], current_regs[REG_PC1], current_regs[REG_PC2],
-            current_regs[REG_SPH], current_regs[REG_SPL],
-            current_regs[REG_SREG]);
+            current_regs[REG_PC0], current_regs[REG_PC1],
+            current_regs[REG_PC2], current_regs[REG_SPH],
+            current_regs[REG_SPL], current_regs[REG_SREG]);
 #endif
     }
 }

arch/avr/src/avr/up_initialstate.c

@@ -113,4 +113,3 @@ void up_initial_state(struct tcb_s *tcb)
   xcp->regs[REG_SREG]  = getsreg() | (1 << SREG_I);
 #endif
 }
-

arch/avr/src/avr/up_schedulesigaction.c

@@ -224,4 +224,3 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 }
 
 #endif /* !CONFIG_DISABLE_SIGNALS */
-

arch/avr/src/avr/up_sigdeliver.c

@@ -155,4 +155,3 @@ void up_sigdeliver(void)
 }
 
 #endif /* !CONFIG_DISABLE_SIGNALS */
-

arch/avr/src/common/up_initialize.c

@@ -301,4 +301,3 @@ void up_initialize(void)
   board_autoled_on(LED_IRQSENABLED);
 #endif
 }
-