Rename all architecture files of form xyz_internal.h to just xyz.h

2015-12-29 18:07:27 -06:00 · 2015-12-29 18:07:27 -06:00 · 8eab9280d8
commit 8eab9280d8
parent 6daa73a945
81 changed files with 81 additions and 81 deletions
--- a/configs/amber/src/atmega_boot.c
+++ b/configs/amber/src/atmega_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "atmega_internal.h"
+#include "atmega.h"
 #include "amber.h"

 /************************************************************************************
--- a/configs/arduino-mega2560/src/avr_boot.c
+++ b/configs/arduino-mega2560/src/avr_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "atmega_internal.h"
+#include "atmega.h"
 #include "arduino_mega2560.h"

 /******************************************************************************
--- a/configs/avr32dev1/src/avr32_boot.c
+++ b/configs/avr32dev1/src/avr32_boot.c
@ -47,7 +47,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "avr32dev1.h"

 /************************************************************************************
--- a/configs/avr32dev1/src/avr32_buttons.c
+++ b/configs/avr32dev1/src/avr32_buttons.c
@ -50,7 +50,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>

-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "avr32dev1.h"

 #ifdef CONFIG_ARCH_BUTTONS
--- a/configs/avr32dev1/src/avr32_leds.c
+++ b/configs/avr32dev1/src/avr32_leds.c
@ -41,7 +41,7 @@

 #include <nuttx/board.h>

-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "avr32dev1.h"

 #ifdef CONFIG_ARCH_LEDS
--- a/configs/ea3131/src/lpc31_boot.c
+++ b/configs/ea3131/src/lpc31_boot.c
@ -46,7 +46,7 @@

 #include "up_arch.h"
 #include "up_internal.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "ea3131.h"

 /************************************************************************************
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@ -57,7 +57,7 @@
 #    include <sys/mount.h>
 #    include <nuttx/sdio.h>
 #    include <nuttx/mmcsd.h>
-#    include "lpc31_internal.h"
+#    include "lpc31.h"
 #  endif
 #endif

--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ea3131/src/lpc31_nsh.c
+++ b/configs/ea3131/src/lpc31_nsh.c
@ -51,7 +51,7 @@
 #  include <nuttx/mmcsd.h>
 #endif

-#include "lpc31_internal.h"
+#include "lpc31.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "ea3131.h"

 #ifdef CONFIG_LPC31_SPI
--- a/configs/ea3131/src/lpc31_usbhost.c
+++ b/configs/ea3131/src/lpc31_usbhost.c
@ -53,7 +53,7 @@

 #include "up_arch.h"

-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "ea3131.h"

 #if defined(CONFIG_LPC31_USBOTG) || defined(CONFIG_USBHOST)
--- a/configs/ea3152/src/lpc31_boot.c
+++ b/configs/ea3152/src/lpc31_boot.c
@ -46,7 +46,7 @@

 #include "up_arch.h"
 #include "up_internal.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "ea3152.h"

 /************************************************************************************
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@ -57,7 +57,7 @@
 #    include <sys/mount.h>
 #    include <nuttx/sdio.h>
 #    include <nuttx/mmcsd.h>
-#    include "lpc31_internal.h"
+#    include "lpc31.h"
 #  endif
 #endif

--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ea3152/src/lpc31_nsh.c
+++ b/configs/ea3152/src/lpc31_nsh.c
@ -51,7 +51,7 @@
 #  include <nuttx/mmcsd.h>
 #endif

-#include "lpc31_internal.h"
+#include "lpc31.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "ea3152.h"

 #ifdef CONFIG_LPC31_SPI
--- a/configs/kwikstik-k40/src/k40_nsh.c
+++ b/configs/kwikstik-k40/src/k40_nsh.c
@ -51,7 +51,7 @@
 #  include <nuttx/mmcsd.h>
 #endif

-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kwikstik-k40.h"

 /****************************************************************************
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kwikstik-k40.h"

 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
--- a/configs/kwikstik-k40/src/k40_usbdev.c
+++ b/configs/kwikstik-k40/src/k40_usbdev.c
@ -48,7 +48,7 @@
 #include <nuttx/usb/usbdev_trace.h>

 #include "up_arch.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kwikstik-k40.h"

 /************************************************************************************
--- a/configs/kwikstik-k40/src/k40_usbmsc.c
+++ b/configs/kwikstik-k40/src/k40_usbmsc.c
@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>

-#include "kinetis_internal.h"
+#include "kinetis.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/micropendous3/src/at90usb_boot.c
+++ b/configs/micropendous3/src/at90usb_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "at90usb_internal.h"
+#include "at90usb.h"
 #include "micropendous3.h"

 /************************************************************************************
--- a/configs/mirtoo/src/pic32_adc.c
+++ b/configs/mirtoo/src/pic32_adc.c
@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "mirtoo.h"

 #ifdef CONFIG_PIC32MX_ADC
--- a/configs/mirtoo/src/pic32_boot.c
+++ b/configs/mirtoo/src/pic32_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-pps.h"
 #include "mirtoo.h"

--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@ -46,7 +46,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "mirtoo.h"

 /****************************************************************************
--- a/configs/mirtoo/src/pic32_nsh.c
+++ b/configs/mirtoo/src/pic32_nsh.c
@ -54,7 +54,7 @@
 #  include <nuttx/fs/nxffs.h>
 #endif

-#include "pic32mx-internal.h"
+#include "pic32mx.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-pps.h"
 #include "mirtoo.h"

--- a/configs/moteino-mega/src/avr_boot.c
+++ b/configs/moteino-mega/src/avr_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "atmega_internal.h"
+#include "atmega.h"
 #include "moteino_mega.h"

 /************************************************************************************
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@ -48,7 +48,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "atmega_internal.h"
+#include "atmega.h"
 #include "moteino_mega.h"

 #ifdef CONFIG_ARCH_LEDS
--- a/configs/ne64badge/src/ne64badge.h
+++ b/configs/ne64badge/src/ne64badge.h
@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>

-#include "m9s12_internal.h"
+#include "m9s12.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/configs/olimex-lpc-h3131/src/lpc31_boot.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_boot.c
@ -46,7 +46,7 @@

 #include "up_arch.h"
 #include "up_internal.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "lpc_h3131.h"

 /************************************************************************************
--- a/configs/olimex-lpc-h3131/src/lpc31_hidkbd.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_hidkbd.c
@ -41,7 +41,7 @@

 #include <nuttx/usb/usbhost.h>

-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "lpc_h3131.h"

 #if defined(CONFIG_LPC31_USBOTG) && defined(CONFIG_USBHOST) && \
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"

 #include "lpc_h3131.h"

--- a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
@ -47,7 +47,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>

-#include "lpc31_internal.h"
+#include "lpc31.h"

 #include "lpc_h3131.h"

--- a/configs/olimex-lpc-h3131/src/lpc31_nsh.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_nsh.c
@ -50,7 +50,7 @@
 #  include <apps/usbmonitor.h>
 #endif

-#include "lpc31_internal.h"
+#include "lpc31.h"

 #include "lpc_h3131.h"

--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "lpc_h3131.h"

 #ifdef CONFIG_LPC31_SPI
--- a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
@ -53,7 +53,7 @@

 #include "up_arch.h"

-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "lpc_h3131.h"

 #ifdef HAVE_USBHOST
--- a/configs/olimex-strp711/src/str71_enc28j60.c
+++ b/configs/olimex-strp711/src/str71_enc28j60.c
@ -93,7 +93,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "str71x_internal.h"
+#include "str71x.h"

 #ifdef CONFIG_ENC28J60

--- a/configs/olimex-strp711/src/str71_spi.c
+++ b/configs/olimex-strp711/src/str71_spi.c
@ -54,7 +54,7 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "str71x_internal.h"
+#include "str71x.h"

 #if defined(CONFIG_STR71X_BSPI0) || defined(CONFIG_STR71X_BSPI1)

--- a/configs/pcblogic-pic32mx/src/pic32mx_boot.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pcblogic-pic32mx.h"

 /************************************************************************************
--- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@ -88,7 +88,7 @@
 #include "up_arch.h"
 #include "pic32mx-pmp.h"
 #include "pic32mx-int.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pcblogic-pic32mx.h"

 #ifdef CONFIG_LCD_LCD1602
--- a/configs/pic32mx-starterkit/src/pic32mx_boot.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-starterkit.h"

 /************************************************************************************
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-ioport.h"
 #include "pic32mx-starterkit.h"

--- a/configs/pic32mx-starterkit/src/pic32mx_nsh.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_nsh.c
@ -50,7 +50,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-starterkit.h"

 /****************************************************************************
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-starterkit.h"

 #if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2) || \
--- a/configs/pic32mx-starterkit/src/pic32mx_usbdev.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_usbdev.c
@ -44,7 +44,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-starterkit.h"

 #if defined(CONFIG_PIC32MX_USBDEV)
--- a/configs/pic32mx-starterkit/src/pic32mx_usbterm.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_usbterm.c
@ -44,7 +44,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-starterkit.h"

 #if defined(CONFIG_PIC32MX_USBDEV) && defined(CONFIG_EXAMPLES_USBTERM_DEVINIT)
--- a/configs/pic32mx7mmb/src/pic32_boot.c
+++ b/configs/pic32mx7mmb/src/pic32_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx7mmb.h"

 /************************************************************************************
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@ -46,7 +46,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx7mmb.h"

 /****************************************************************************
--- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@ -56,7 +56,7 @@
 #include <arch/board/board.h>

 #include "up_arch.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-pmp.h"
 #include "pic32mx7mmb.h"

--- a/configs/pic32mx7mmb/src/pic32_nsh.c
+++ b/configs/pic32mx7mmb/src/pic32_nsh.c
@ -50,7 +50,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx7mmb.h"

 /****************************************************************************
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx7mmb.h"

 #if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2) || \
--- a/configs/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c
@ -58,7 +58,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-adc.h"
 #include "pic32mx-ioport.h"
 #include "pic32mx7mmb.h"
--- a/configs/pic32mx7mmb/src/pic32_usbdev.c
+++ b/configs/pic32mx7mmb/src/pic32_usbdev.c
@ -44,7 +44,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx7mmb.h"

 #if defined(CONFIG_PIC32MX_USBDEV)
--- a/configs/pic32mx7mmb/src/pic32_usbterm.c
+++ b/configs/pic32mx7mmb/src/pic32_usbterm.c
@ -44,7 +44,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx7mmb.h"

 #if defined(CONFIG_PIC32MX_USBDEV) && defined(CONFIG_EXAMPLES_USBTERM_DEVINIT)
--- a/configs/qemu-i486/src/qemu_boot.c
+++ b/configs/qemu-i486/src/qemu_boot.c
@ -47,7 +47,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "qemu_internal.h"
+#include "qemu.h"
 #include "qemu_i486.h"

 /************************************************************************************
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-ioport.h"
 #include "sure-pic32mx.h"

--- a/configs/sure-pic32mx/src/pic32mx_boot.c
+++ b/configs/sure-pic32mx/src/pic32mx_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "sure-pic32mx.h"

 /************************************************************************************
--- a/configs/sure-pic32mx/src/pic32mx_buttons.c
+++ b/configs/sure-pic32mx/src/pic32mx_buttons.c
@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-ioport.h"
 #include "pic32mx-adc.h"
 #include "sure-pic32mx.h"
--- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
@ -91,7 +91,7 @@
 #include "up_arch.h"
 #include "pic32mx-ioport.h"
 #include "pic32mx-int.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "sure-pic32mx.h"

 #ifdef CONFIG_LCD_LCD1602
--- a/configs/sure-pic32mx/src/pic32mx_nsh.c
+++ b/configs/sure-pic32mx/src/pic32mx_nsh.c
@ -55,7 +55,7 @@
 #  include <apps/usbmonitor.h>
 #endif

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "sure-pic32mx.h"

 /****************************************************************************
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "sure-pic32mx.h"

 #if defined(CONFIG_PIC32MX_SPI2)
--- a/configs/sure-pic32mx/src/pic32mx_usbdev.c
+++ b/configs/sure-pic32mx/src/pic32mx_usbdev.c
@ -47,7 +47,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "sure-pic32mx.h"

 #if defined(CONFIG_PIC32MX_USBDEV)
--- a/configs/sure-pic32mx/src/pic32mx_usbterm.c
+++ b/configs/sure-pic32mx/src/pic32mx_usbterm.c
@ -47,7 +47,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "sure-pic32mx.h"

 #if defined(CONFIG_PIC32MX_USBDEV) && defined(CONFIG_EXAMPLES_USBTERM_DEVINIT)
--- a/configs/teensy-2.0/src/at90usb_boot.c
+++ b/configs/teensy-2.0/src/at90usb_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "at90usb_internal.h"
+#include "at90usb.h"
 #include "teensy-20.h"

 /************************************************************************************
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@ -48,7 +48,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "at90usb_internal.h"
+#include "at90usb.h"
 #include "teensy-20.h"

 #ifdef CONFIG_ARCH_LEDS
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@ -49,7 +49,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "at90usb_internal.h"
+#include "at90usb.h"
 #include "teensy-20.h"

 #ifdef CONFIG_AVR_SPI
--- a/configs/teensy-2.0/src/at90usb_usbmsc.c
+++ b/configs/teensy-2.0/src/at90usb_usbmsc.c
@ -48,7 +48,7 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>

-#include "at90usb_internal.h"
+#include "at90usb.h"
 #include "teensy-20.h"

 /****************************************************************************
--- a/configs/teensy-3.x/src/k20_autoleds.c
+++ b/configs/teensy-3.x/src/k20_autoleds.c
@ -43,7 +43,7 @@

 #include <nuttx/board.h>

-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "teensy-3x.h"

 #ifdef CONFIG_ARCH_LEDS
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "teensy-3x.h"

 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
--- a/configs/teensy-3.x/src/k20_userleds.c
+++ b/configs/teensy-3.x/src/k20_userleds.c
@ -42,7 +42,7 @@
 #include <stdbool.h>
 #include <debug.h>

-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "teensy-3x.h"

 #ifndef CONFIG_ARCH_LEDS
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@ -43,7 +43,7 @@

 #include <nuttx/board.h>

-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "twr-k60n512.h"

 /****************************************************************************
--- a/configs/twr-k60n512/src/k60_nsh.c
+++ b/configs/twr-k60n512/src/k60_nsh.c
@ -51,7 +51,7 @@
 #  include <nuttx/mmcsd.h>
 #endif

-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "twr-k60n512.h"

 /****************************************************************************
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@ -48,7 +48,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "twr-k60n512.h"

 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
--- a/configs/twr-k60n512/src/k60_usbdev.c
+++ b/configs/twr-k60n512/src/k60_usbdev.c
@ -48,7 +48,7 @@
 #include <nuttx/usb/usbdev_trace.h>

 #include "up_arch.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "twr-k60n512.h"

 /************************************************************************************
--- a/configs/twr-k60n512/src/k60_usbmsc.c
+++ b/configs/twr-k60n512/src/k60_usbmsc.c
@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>

-#include "kinetis_internal.h"
+#include "kinetis.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ubw32/src/pic32_boot.c
+++ b/configs/ubw32/src/pic32_boot.c
@ -46,7 +46,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "ubw32.h"

 /************************************************************************************
--- a/configs/ubw32/src/pic32_buttons.c
+++ b/configs/ubw32/src/pic32_buttons.c
@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "ubw-internal.h"

 #ifdef CONFIG_ARCH_BUTTONS
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "ubw32.h"

 /****************************************************************************
--- a/configs/ubw32/src/pic32_nsh.c
+++ b/configs/ubw32/src/pic32_nsh.c
@ -44,7 +44,7 @@

 #include <nuttx/board.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "ubw32.h"

 /****************************************************************************
--- a/configs/ubw32/src/pic32_usbdev.c
+++ b/configs/ubw32/src/pic32_usbdev.c
@ -44,7 +44,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "ubw32.h"

 #if defined(CONFIG_PIC32MX_USBDEV)
--- a/configs/ubw32/src/pic32_usbterm.c
+++ b/configs/ubw32/src/pic32_usbterm.c
@ -44,7 +44,7 @@

 #include <nuttx/usb/usbdev.h>

-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "ubw32.h"

 #if defined(CONFIG_PIC32MX_USBDEV) && defined(CONFIG_EXAMPLES_USBTERM_DEVINIT)