Rename arch/arm/src/efm32/chip to arch/arm/src/efm32/hardware.

arch/arm/src/efm32/efm32_adc.h

@@ -44,7 +44,7 @@
 
 #include "chip.h"
 
-#include "chip/efm32_adc.h"
+#include "hardware/efm32_adc.h"
 
 #include <nuttx/analog/adc.h>
 

arch/arm/src/efm32/efm32_bitband.h

@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/efm32/efm32_clockconfig.c

@@ -50,9 +50,9 @@
 #include "chip.h"
 #include "itm_syslog.h"
 #include "efm32_gpio.h"
-#include "chip/efm32_msc.h"
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_gpio.h"
+#include "hardware/efm32_msc.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_gpio.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/efm32/efm32_dma.c

@@ -50,8 +50,8 @@
 #include <nuttx/arch.h>
 
 #include "up_arch.h"
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_dma.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_dma.h"
 #include "efm32_dma.h"
 
 /****************************************************************************

arch/arm/src/efm32/efm32_dma.h

@@ -47,7 +47,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/efm32_dma.h"
+#include "hardware/efm32_dma.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/efm32/efm32_flash.c

@@ -80,8 +80,8 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/efm32_msc.h"
-#include "chip/efm32_devinfo.h"
+#include "hardware/efm32_msc.h"
+#include "hardware/efm32_devinfo.h"
 
 #include "efm32_bitband.h"
 

arch/arm/src/efm32/efm32_gpio.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include "up_arch.h"
-#include "chip/efm32_gpio.h"
+#include "hardware/efm32_gpio.h"
 #include "efm32_gpio.h"
 
 /************************************************************************************

arch/arm/src/efm32/efm32_gpioirq.c

@@ -47,7 +47,7 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "chip/efm32_gpio.h"
+#include "hardware/efm32_gpio.h"
 #include "efm32_gpio.h"
 #include "efm32_bitband.h"
 

arch/arm/src/efm32/efm32_i2c.c

@@ -80,8 +80,8 @@
 #include "up_arch.h"
 
 #include "efm32_gpio.h"
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_i2c.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_i2c.h"
 
 /* At least one I2C peripheral must be enabled */
 

arch/arm/src/efm32/efm32_leserial.c

@@ -57,7 +57,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_leuart.h"
+#include "hardware/efm32_leuart.h"
 #include "efm32_config.h"
 #include "efm32_lowputc.h"
 

arch/arm/src/efm32/efm32_lowputc.c

@@ -47,10 +47,10 @@
 
 #include "up_arch.h"
 
-#include "chip/efm32_memorymap.h"
-#include "chip/efm32_usart.h"
-#include "chip/efm32_leuart.h"
-#include "chip/efm32_cmu.h"
+#include "hardware/efm32_memorymap.h"
+#include "hardware/efm32_usart.h"
+#include "hardware/efm32_leuart.h"
+#include "hardware/efm32_cmu.h"
 
 #include "efm32_gpio.h"
 #include "efm32_lowputc.h"

arch/arm/src/efm32/efm32_pwm.c

@@ -53,8 +53,8 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_timer.h"
 #include "efm32_timer.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"

arch/arm/src/efm32/efm32_pwm.h

@@ -82,7 +82,7 @@
     defined(CONFIG_EFM32_TIMER3_PWM)
 
 #include <arch/board/board.h>
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_timer.h"
 
 /* For each timer that is enabled for PWM usage, we need the following additional
  * configuration settings:

arch/arm/src/efm32/efm32_rmu.c

@@ -50,8 +50,8 @@
 
 #include "up_arch.h"
 
-#include "chip/efm32_emu.h"
-#include "chip/efm32_rmu.h"
+#include "hardware/efm32_emu.h"
+#include "hardware/efm32_rmu.h"
 
 #include "efm32_rmu.h"
 

arch/arm/src/efm32/efm32_rmu.h

@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_rmu.h"
+#include "hardware/efm32_rmu.h"
 
 #ifdef CONFIG_EFM32_RMU
 

arch/arm/src/efm32/efm32_rtc_burtc.c

@@ -53,7 +53,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/efm32_burtc.h"
+#include "hardware/efm32_burtc.h"
 
 #include "efm32_rmu.h"
 #include "efm32_rtc.h"

arch/arm/src/efm32/efm32_serial.c

@@ -61,7 +61,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_usart.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
 #include "efm32_lowputc.h"

arch/arm/src/efm32/efm32_spi.c

@@ -62,7 +62,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_usart.h"
 #include "efm32_config.h"
 #include "efm32_dma.h"
 #include "efm32_lowputc.h"

arch/arm/src/efm32/efm32_timer.c

@@ -51,7 +51,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_timer.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
 

arch/arm/src/efm32/efm32_timer.h

@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_timer.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/efm32/efm32_usb.h

@@ -44,7 +44,7 @@
 
 #include <stdint.h>
 
-#include "chip/efm32_usb.h"
+#include "hardware/efm32_usb.h"
 
 #if defined(CONFIG_EFM32_OTGFS)
 

arch/arm/src/efm32/efm32_usbdev.c

@@ -60,7 +60,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_cmu.h"
+#include "hardware/efm32_cmu.h"
 
 #include "efm32_usb.h"
 

arch/arm/src/efm32/hardware/efm32_acmp.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_adc.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_aes.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_burtc.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_calibrate.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_cmu.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_dac.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_devinfo.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_dma.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_emu.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_gpio.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_i2c.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_lcd.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_lesense.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_letimer.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_leuart.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_memorymap.h

@@ -44,11 +44,11 @@
 #include "chip.h"
 
 #if defined(CONFIG_EFM32_EFM32TG)
-#  include "chip/efm32tg_memorymap.h"
+#  include "hardware/efm32tg_memorymap.h"
 #elif defined(CONFIG_EFM32_EFM32G)
-#  include "chip/efm32g_memorymap.h"
+#  include "hardware/efm32g_memorymap.h"
 #elif defined(CONFIG_EFM32_EFM32GG)
-#  include "chip/efm32gg_memorymap.h"
+#  include "hardware/efm32gg_memorymap.h"
 #else
 #  error "Unsupported EFM32 memory map"
 #endif

arch/arm/src/efm32/hardware/efm32_msc.h

@@ -65,7 +65,7 @@
  * Included Files
  *******************************************************************************************************************************/
 
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 /*******************************************************************************************************************************
  * Pre-processor Definitions

arch/arm/src/efm32/hardware/efm32_pcnt.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_prs.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_rmu.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_romtable.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_rtc.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_timer.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this architecture

arch/arm/src/efm32/hardware/efm32_usart.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_usb.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture

arch/arm/src/efm32/hardware/efm32_vcmp.h

@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture