Rename all use of up_boardinitialize(). Should not use common microprocessing naming convention but rather the microprocessor-specific naming conventioni

17 files changed, 98 insertions, 98 deletions

diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h b/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h
index 1601bd063..6d1c3abf0 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/at32uc3/at32uc3_internal.h
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -165,7 +165,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -182,7 +183,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-EXTERN void up_clkinitialize(void);
+void up_clkinitialize(void);
 
 /****************************************************************************
  * Name: usart_reset
@@ -192,7 +193,7 @@ EXTERN void up_clkinitialize(void);
  *
  ****************************************************************************/
 
-EXTERN void usart_reset(uintptr_t usart_base);
+void usart_reset(uintptr_t usart_base);
 
 /****************************************************************************
  * Name: usart_configure
@@ -215,18 +216,18 @@ void usart_configure(uintptr_t usart_base, uint32_t baud, unsigned int parity,
  *
  ****************************************************************************/
 
-EXTERN void up_consoleinit(void);
+void up_consoleinit(void);
 
 /****************************************************************************
- * Name: up_boardinit
+ * Name: at32uc3_boardinitialize
  *
  * Description:
  *   This function must be provided by the board-specific logic in the
- *   directory configs/<board-name>/up_boot.c.
+ *   directory configs/<board-name>/src.
  *
  ****************************************************************************/
 
-EXTERN void up_boardinitialize(void);
+void at32uc3_boardinitialize(void);
 
 /****************************************************************************
  * Name: at32uc3_configgpio
@@ -236,7 +237,7 @@ EXTERN void up_boardinitialize(void);
  *
  ****************************************************************************/
 
-EXTERN int at32uc3_configgpio(uint16_t cfgset);
+int at32uc3_configgpio(uint16_t cfgset);
 
 /****************************************************************************
  * Name: at32uc3_gpiowrite
@@ -246,7 +247,7 @@ EXTERN int at32uc3_configgpio(uint16_t cfgset);
  *
  ****************************************************************************/
 
-EXTERN void at32uc3_gpiowrite(uint16_t pinset, bool value);
+void at32uc3_gpiowrite(uint16_t pinset, bool value);
 
 /****************************************************************************
  * Name: at32uc3_gpioread
@@ -256,7 +257,7 @@ EXTERN void at32uc3_gpiowrite(uint16_t pinset, bool value);
  *
  ****************************************************************************/
 
-EXTERN bool at32uc3_gpioread(uint16_t pinset);
+bool at32uc3_gpioread(uint16_t pinset);
 
 /****************************************************************************
  * Name: gpio_irqinitialize
@@ -277,7 +278,7 @@ EXTERN bool at32uc3_gpioread(uint16_t pinset);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN void weak_function gpio_irqinitialize(void);
+void weak_function gpio_irqinitialize(void);
 #endif
 
 /****************************************************************************
@@ -295,7 +296,7 @@ EXTERN void weak_function gpio_irqinitialize(void);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
+int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
 #endif
 
 /****************************************************************************
@@ -313,7 +314,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
 #endif
 
 /*****************************************************************************
@@ -331,7 +332,7 @@ EXTERN void gpio_irqenable(int irq);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
 #endif
 
 #undef EXTERN
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c b/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
index d1281491c..29dc0cb79 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
@@ -101,7 +101,7 @@ void up_lowinit(void)
 
   /* Perform board-level initialization */
 
-  up_boardinitialize();
+  at32uc3_boardinitialize();
 }
 
 
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_internal.h b/nuttx/arch/avr/src/at90usb/at90usb_internal.h
index 8e4dfc0e6..6c50fa78d 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_internal.h
+++ b/nuttx/arch/avr/src/at90usb/at90usb_internal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/at90usb/at90usb_internal.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -84,11 +85,11 @@ extern "C" {
  * Name: up_clkinit
  *
  * Description:
- *   Initialiaze clock/PLL settings per the definitions in the board.h file.
+ *   Initialize clock/PLL settings per the definitions in the board.h file.
  *
  ****************************************************************************/
 
-EXTERN void up_clkinitialize(void);
+void up_clkinitialize(void);
 
 /****************************************************************************
  * Name: usart1_reset
@@ -98,7 +99,7 @@ EXTERN void up_clkinitialize(void);
  *
  ****************************************************************************/
 
-EXTERN void usart1_reset(void);
+void usart1_reset(void);
 
 /****************************************************************************
  * Name: usart1_configure
@@ -108,30 +109,30 @@ EXTERN void usart1_reset(void);
  *
  ****************************************************************************/
 
-EXTERN void usart1_configure(void);
+void usart1_configure(void);
 
 /****************************************************************************
  * Name: up_consoleinit
  *
  * Description:
  *   Initialize a console for debug output.  This function is called very
- *   early in the initializeation sequence to configure the serial console
- *   uart (only).
+ *   early in the initialization sequence to configure the serial console
+ *   UART (only).
  *
  ****************************************************************************/
 
-EXTERN void up_consoleinit(void);
+void up_consoleinit(void);
 
 /****************************************************************************
- * Name: up_boardinit
+ * Name: at90usb_boardinitialize
  *
  * Description:
  *   This function must be provided by the board-specific logic in the
- *   directory configs/<board-name>/up_boot.c.
+ *   directory configs/<board-name>/src/.
  *
  ****************************************************************************/
 
-EXTERN void up_boardinitialize(void);
+void at90usb_boardinitialize(void);
 
 /****************************************************************************
  * Name: gpio_irqinitialize
@@ -150,7 +151,7 @@ EXTERN void up_boardinitialize(void);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void weak_function gpio_irqinitialize(void);
+void weak_function gpio_irqinitialize(void);
 #endif
 
 /****************************************************************************
@@ -166,7 +167,7 @@ EXTERN void weak_function gpio_irqinitialize(void);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
+int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
 #endif
 
 /****************************************************************************
@@ -182,7 +183,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
 #endif
 
 /*****************************************************************************
@@ -198,7 +199,7 @@ EXTERN void gpio_irqenable(int irq);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
 #endif
 
 #undef EXTERN
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
index 89de8b8ca..68a8d1f34 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
+++ b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
@@ -1,7 +1,7 @@
 /**************************************************************************
  * arch/avr/src/at90usb/at90usb_lowinit.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -148,7 +148,5 @@ void up_lowinit(void)
 
   /* Perform board-level initialization */
 
-  up_boardinitialize();
+  at90usb_boardinitialize();
 }
-
-
diff --git a/nuttx/arch/avr/src/atmega/atmega_internal.h b/nuttx/arch/avr/src/atmega/atmega_internal.h
index 007b42425..e776cc3c0 100644
--- a/nuttx/arch/avr/src/atmega/atmega_internal.h
+++ b/nuttx/arch/avr/src/atmega/atmega_internal.h
@@ -71,7 +71,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -88,7 +89,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-EXTERN void up_clkinitialize(void);
+void up_clkinitialize(void);
 
 /****************************************************************************
  * Name: usart0_reset and usart1_reset
@@ -98,8 +99,8 @@ EXTERN void up_clkinitialize(void);
  *
  ****************************************************************************/
 
-EXTERN void usart0_reset(void);
-EXTERN void usart1_reset(void);
+void usart0_reset(void);
+void usart1_reset(void);
 
 /****************************************************************************
  * Name: usart0_configure and usart1_configure
@@ -109,8 +110,8 @@ EXTERN void usart1_reset(void);
  *
  ****************************************************************************/
 
-EXTERN void usart0_configure(void);
-EXTERN void usart1_configure(void);
+void usart0_configure(void);
+void usart1_configure(void);
 
 /****************************************************************************
  * Name: up_consoleinit
@@ -122,18 +123,18 @@ EXTERN void usart1_configure(void);
  *
  ****************************************************************************/
 
-EXTERN void up_consoleinit(void);
+void up_consoleinit(void);
 
 /****************************************************************************
- * Name: up_boardinit
+ * Name: atmega_boardinitialize
  *
  * Description:
  *   This function must be provided by the board-specific logic in the
- *   directory configs/<board-name>/up_boot.c.
+ *   directory configs/<board-name>/src.
  *
  ****************************************************************************/
 
-EXTERN void up_boardinitialize(void);
+void atmega_boardinitialize(void);
 
 /****************************************************************************
  * Name: gpio_irqinitialize
@@ -152,7 +153,7 @@ EXTERN void up_boardinitialize(void);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void weak_function gpio_irqinitialize(void);
+void weak_function gpio_irqinitialize(void);
 #endif
 
 /****************************************************************************
@@ -168,7 +169,7 @@ EXTERN void weak_function gpio_irqinitialize(void);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
+int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
 #endif
 
 /****************************************************************************
@@ -184,7 +185,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
 #endif
 
 /*****************************************************************************
@@ -200,7 +201,7 @@ EXTERN void gpio_irqenable(int irq);
  ****************************************************************************/
 
 #ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
 #endif
 
 #undef EXTERN
diff --git a/nuttx/arch/avr/src/atmega/atmega_lowinit.c b/nuttx/arch/avr/src/atmega/atmega_lowinit.c
index 0acd08422..8987ea25e 100644
--- a/nuttx/arch/avr/src/atmega/atmega_lowinit.c
+++ b/nuttx/arch/avr/src/atmega/atmega_lowinit.c
@@ -1,7 +1,7 @@
 /**************************************************************************
  * arch/avr/src/atmega/atmega_lowinit.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -153,7 +153,7 @@ void up_lowinit(void)
 
   /* Perform board-level initialization */
 
-  up_boardinitialize();
+  atmega_boardinitialize();
 }
 
 
diff --git a/nuttx/arch/avr/src/avr/avr_internal.h b/nuttx/arch/avr/src/avr/avr_internal.h
index f74d682e5..b0b8dba96 100644
--- a/nuttx/arch/avr/src/avr/avr_internal.h
+++ b/nuttx/arch/avr/src/avr/avr_internal.h
@@ -146,7 +146,7 @@ uint8_t *up_doirq(uint8_t irq, uint8_t *regs);
  *   including up_spiinitialize()) are provided by common LPC17xx logic.  To use
  *   this common SPI logic on your board:
  *
- *   1. Provide logic in up_boardinitialize() to configure SPI chip select
+ *   1. Provide logic in <arch>_boardinitialize() to configure SPI chip select
  *      pins.
  *   2. Provide avr_spiselect() and avr_spistatus() functions in your board-specific
  *      logic.  These functions will perform chip selection and status operations
diff --git a/nuttx/arch/avr/src/avr32/avr32_internal.h b/nuttx/arch/avr/src/avr32/avr32_internal.h
index c98f0b5cc..14d9c8521 100644
--- a/nuttx/arch/avr/src/avr32/avr32_internal.h
+++ b/nuttx/arch/avr/src/avr32/avr32_internal.h
@@ -88,7 +88,7 @@ extern uint32_t g_idle_topstack;
  ****************************************************************************/
 
 /****************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
@@ -102,7 +102,7 @@ extern uint32_t g_idle_topstack;
  *
  ************************************************************************************/
 
-extern void up_copystate(uint32_t *dest, uint32_t *src);
+void up_copystate(uint32_t *dest, uint32_t *src);
 
 /************************************************************************************
  * Name:  up_fullcontextrestore
@@ -112,7 +112,7 @@ extern void up_copystate(uint32_t *dest, uint32_t *src);
  *
  ************************************************************************************/
 
-extern void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
 
 /************************************************************************************
  * Name:  up_switchcontext
@@ -122,7 +122,7 @@ extern void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  *
  ************************************************************************************/
 
-extern void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
+void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
 
 /************************************************************************************
  * Name:  up_doirq
@@ -132,7 +132,7 @@ extern void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
  *
  ************************************************************************************/
 
-extern uint32_t *up_doirq(int irq, uint32_t *regs);
+uint32_t *up_doirq(int irq, uint32_t *regs);
 
 #endif /* __ASSEMBLY__ */
 #endif  /* __ARCH_AVR_SRC_AVR32_AVR32_INTERNAL_H */
diff --git a/nuttx/arch/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h
index c38d9e131..147c186ba 100644
--- a/nuttx/arch/x86/src/common/up_internal.h
+++ b/nuttx/arch/x86/src/common/up_internal.h
@@ -179,6 +179,17 @@ extern uint32_t _ebss;            /* End+1 of .bss */
 
 #ifndef __ASSEMBLY__
 
+/****************************************************************************
+ * Name: x86_boardinitialize
+ *
+ * Description:
+ *   This function must be provided by the board-specific logic in the
+ *   directory configs/<board-name>/src/.
+ *
+ ****************************************************************************/
+
+void x86_boardinitialize(void);
+
 /* Defined in files with the same name as the function */
 
 extern void up_boot(void);
diff --git a/nuttx/arch/x86/src/qemu/qemu_lowsetup.c b/nuttx/arch/x86/src/qemu/qemu_lowsetup.c
index db2b01ef5..439f4fcd5 100644
--- a/nuttx/arch/x86/src/qemu/qemu_lowsetup.c
+++ b/nuttx/arch/x86/src/qemu/qemu_lowsetup.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/x86/src/qemu/qemu_lowsetup.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -135,6 +135,6 @@ void up_lowsetup(void)
 
   /* Now perform board-specific initializations */
 
-  up_boardinitialize();
+  x86_boardinitialize();
 }
 
diff --git a/nuttx/configs/amber/src/up_boot.c b/nuttx/configs/amber/src/up_boot.c
index 94568fbce..b0b5656e8 100644
--- a/nuttx/configs/amber/src/up_boot.c
+++ b/nuttx/configs/amber/src/up_boot.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/amber/src/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "amber_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -62,16 +62,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: atmega_boardinitialize
  *
  * Description:
  *   All ATMega architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void atmega_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function atmega_spiinitialize() has been brought into the link.
diff --git a/nuttx/configs/avr32dev1/src/up_boot.c b/nuttx/configs/avr32dev1/src/up_boot.c
index 0763ecfcf..75f0e9e71 100644
--- a/nuttx/configs/avr32dev1/src/up_boot.c
+++ b/nuttx/configs/avr32dev1/src/up_boot.c
@@ -63,16 +63,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: at32uc3_boardinitialize
  *
  * Description:
- *   All AVR32 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
+ *   All AVR32 AT32UC3 architectures must provide the following entry point.  This
+ *   entry point is called early in the initialization -- after all memory has been
+ *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void at32uc3_boardinitialize(void)
 {
   /* Configure SPI chip selects */
 
diff --git a/nuttx/configs/micropendous3/src/up_boot.c b/nuttx/configs/micropendous3/src/up_boot.c
index 912440c19..9a9e80f32 100644
--- a/nuttx/configs/micropendous3/src/up_boot.c
+++ b/nuttx/configs/micropendous3/src/up_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/micropendous3/src/up_boot.c
- * arch/mips/src/board/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +50,7 @@
 #include "micropendous3_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -63,16 +62,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: at90usb_boardinitialize
  *
  * Description:
  *   All AT90USB architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void at90usb_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function at90usb_spiinitialize() has been brought into the link.
diff --git a/nuttx/configs/moteino-mega/src/avr_boot.c b/nuttx/configs/moteino-mega/src/avr_boot.c
index e38da636b..00163a0f7 100644
--- a/nuttx/configs/moteino-mega/src/avr_boot.c
+++ b/nuttx/configs/moteino-mega/src/avr_boot.c
@@ -62,7 +62,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: atmega_boardinitialize
  *
  * Description:
  *   All ATMega architectures must provide the following entry point.  This entry
@@ -71,7 +71,7 @@
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void atmega_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function atmega_spiinitialize() has been brought into the link.
diff --git a/nuttx/configs/qemu-i486/include/board.h b/nuttx/configs/qemu-i486/include/board.h
index 4dcd9d7a8..bf671acc4 100644
--- a/nuttx/configs/qemu-i486/include/board.h
+++ b/nuttx/configs/qemu-i486/include/board.h
@@ -72,7 +72,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -80,17 +81,6 @@ extern "C" {
 /************************************************************************************
  * Public Function Prototypes
  ************************************************************************************/
-/************************************************************************************
- * Name: up_boardinitialize
- *
- * Description:
- *   All x86 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
- *
- ************************************************************************************/
-
-EXTERN void up_boardinitialize(void);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/nuttx/configs/qemu-i486/src/qemu_boot.c b/nuttx/configs/qemu-i486/src/qemu_boot.c
index 27b05b397..8f43ebf91 100644
--- a/nuttx/configs/qemu-i486/src/qemu_boot.c
+++ b/nuttx/configs/qemu-i486/src/qemu_boot.c
@@ -63,16 +63,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: x86_boardinitialize
  *
  * Description:
  *   All x86 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
+ *   is called early in the initialization -- after all memory has been configured
  *   and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void x86_boardinitialize(void)
 {
   /* Configure on-board LEDs if LED support has been selected. */
 
diff --git a/nuttx/configs/teensy/src/up_boot.c b/nuttx/configs/teensy/src/up_boot.c
index 7c8811272..8764949c9 100644
--- a/nuttx/configs/teensy/src/up_boot.c
+++ b/nuttx/configs/teensy/src/up_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/teensy/src/up_boot.c
- * arch/mips/src/board/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,16 +62,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: at90usb_boardinitialize
  *
  * Description:
  *   All AT90USB architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void at90usb_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function at90usb_spiinitialize() has been brought into the link.