diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 79637bfaa59..8f01da96e62 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -101,14 +101,20 @@ CONFIG_AVR32_AVRTOOLSL=n
 #
 # CONFIG_AVR32_USARTn - Enable support for USARTn
 # CONFIG_AVR32_USARTn_RS232 - Configure USARTn as an RS232 interface.
+# CONFIG_AVR32_USARTn_SPI - Configure USARTn as an SPI interface.
 #
 
 CONFIG_AVR32_USART0=y
-CONFIG_AVR32_USART1=n
-CONFIG_AVR32_USART2=n
 CONFIG_AVR32_USART0_RS232=y
-CONFIG_AVR32_USART1_RS232=y
-CONFIG_AVR32_USART2_RS232=y
+CONFIG_AVR32_USART0_SPI=n
+
+CONFIG_AVR32_USART1=n
+CONFIG_AVR32_USART1_RS232=n
+CONFIG_AVR32_USART1_SPI=n
+
+CONFIG_AVR32_USART2=n
+CONFIG_AVR32_USART2_RS232=n
+CONFIG_AVR32_USART2_SPI=n
 
 #
 # AVR32 specific serial device driver settings
diff --git a/configs/avr32dev1/src/avr32dev1_internal.h b/configs/avr32dev1/src/avr32dev1_internal.h
index 79901ea7d28..b0fedd751a2 100755
--- a/configs/avr32dev1/src/avr32dev1_internal.h
+++ b/configs/avr32dev1/src/avr32dev1_internal.h
@@ -48,7 +48,7 @@
  * Definitions
  ************************************************************************************/
 
-/* AT91DEV1 GPIO Pin Definitions ****************************************************/
+/* AVRDEV1 GPIO Pin Definitions *****************************************************/
 
 /************************************************************************************
  * Public Types
@@ -64,6 +64,17 @@
  * Public Functions
  ************************************************************************************/
 
+/************************************************************************************
+ * Name: avr32dev1_ledinitialize
+ *
+ * Description:
+ *   Configure on-board LEDs if LED support has been selected.
+ ************************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+extern void avr32dev1_ledinitialize(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_AT91DEV1_SRC_AT91DEV1_INTERNAL_H */
 
diff --git a/configs/avr32dev1/src/up_boot.c b/configs/avr32dev1/src/up_boot.c
index 0fc8971d1de..f75cda398fc 100755
--- a/configs/avr32dev1/src/up_boot.c
+++ b/configs/avr32dev1/src/up_boot.c
@@ -63,7 +63,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: avr32_boardinitialize
+ * Name: at91uc3_boardinitialize
  *
  * Description:
  *   All AVR32 architectures must provide the following entry point.  This entry point
@@ -72,13 +72,13 @@
  *
  ************************************************************************************/
 
-void avr32_boardinitialize(void)
+void at91uc3_boardinitialize(void)
 {
   /* Configure SPI chip selects */
 
   /* Configure on-board LEDs if LED support has been selected. */
 
 #ifdef CONFIG_ARCH_LEDS
-  up_ledinit();
+  avr32dev1_ledinitialize();
 #endif
 }