diff --git a/arch/arm/src/efm32/efm32_adc.h b/arch/arm/src/efm32/efm32_adc.h index 9b892c0663e..53ef6a62f83 100644 --- a/arch/arm/src/efm32/efm32_adc.h +++ b/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 diff --git a/arch/arm/src/efm32/efm32_bitband.h b/arch/arm/src/efm32/efm32_bitband.h index 9c655de78a4..e84a7ff05d4 100644 --- a/arch/arm/src/efm32/efm32_bitband.h +++ b/arch/arm/src/efm32/efm32_bitband.h @@ -42,7 +42,7 @@ #include -#include "chip/efm32_memorymap.h" +#include "hardware/efm32_memorymap.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c index 2ff0670f510..2d2bd907b40 100644 --- a/arch/arm/src/efm32/efm32_clockconfig.c +++ b/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 diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c index 7efc1d20219..ddb2e23fd01 100644 --- a/arch/arm/src/efm32/efm32_dma.c +++ b/arch/arm/src/efm32/efm32_dma.c @@ -50,8 +50,8 @@ #include #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" /**************************************************************************** diff --git a/arch/arm/src/efm32/efm32_dma.h b/arch/arm/src/efm32/efm32_dma.h index 19eec8b0e93..8d323336273 100644 --- a/arch/arm/src/efm32/efm32_dma.h +++ b/arch/arm/src/efm32/efm32_dma.h @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/efm32_dma.h" +#include "hardware/efm32_dma.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/efm32/efm32_flash.c b/arch/arm/src/efm32/efm32_flash.c index 66cae06ab34..24d74aca8a5 100644 --- a/arch/arm/src/efm32/efm32_flash.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_gpio.c b/arch/arm/src/efm32/efm32_gpio.c index 7ffc58cf344..2366a26c212 100644 --- a/arch/arm/src/efm32/efm32_gpio.c +++ b/arch/arm/src/efm32/efm32_gpio.c @@ -45,7 +45,7 @@ #include #include "up_arch.h" -#include "chip/efm32_gpio.h" +#include "hardware/efm32_gpio.h" #include "efm32_gpio.h" /************************************************************************************ diff --git a/arch/arm/src/efm32/efm32_gpioirq.c b/arch/arm/src/efm32/efm32_gpioirq.c index 1b317582811..dd31f639ed6 100644 --- a/arch/arm/src/efm32/efm32_gpioirq.c +++ b/arch/arm/src/efm32/efm32_gpioirq.c @@ -47,7 +47,7 @@ #include #include "up_arch.h" -#include "chip/efm32_gpio.h" +#include "hardware/efm32_gpio.h" #include "efm32_gpio.h" #include "efm32_bitband.h" diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c index 87e6b827478..8f2e0e98cfe 100644 --- a/arch/arm/src/efm32/efm32_i2c.c +++ b/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 */ diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c index 2303f7ce72a..dee04cef0d4 100644 --- a/arch/arm/src/efm32/efm32_leserial.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_lowputc.c b/arch/arm/src/efm32/efm32_lowputc.c index 26ec02884aa..466f7c93f21 100644 --- a/arch/arm/src/efm32/efm32_lowputc.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c index e619f805692..5cfaab505b2 100644 --- a/arch/arm/src/efm32/efm32_pwm.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_pwm.h b/arch/arm/src/efm32/efm32_pwm.h index 909137c9c07..9b987267ec4 100644 --- a/arch/arm/src/efm32/efm32_pwm.h +++ b/arch/arm/src/efm32/efm32_pwm.h @@ -82,7 +82,7 @@ defined(CONFIG_EFM32_TIMER3_PWM) #include -#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: diff --git a/arch/arm/src/efm32/efm32_rmu.c b/arch/arm/src/efm32/efm32_rmu.c index fbed325339e..744fbd17275 100644 --- a/arch/arm/src/efm32/efm32_rmu.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h index 9a7a32dbdc8..7fb44beaa4b 100644 --- a/arch/arm/src/efm32/efm32_rmu.h +++ b/arch/arm/src/efm32/efm32_rmu.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/efm32_rmu.h" +#include "hardware/efm32_rmu.h" #ifdef CONFIG_EFM32_RMU diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index d0028b6a11f..9ce34673e41 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c index e1ecd7a837d..80eb14c3fdd 100644 --- a/arch/arm/src/efm32/efm32_serial.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c index 7fe5139666d..843519157d8 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c index f8c1b1eaafe..86121c2d75b 100644 --- a/arch/arm/src/efm32/efm32_timer.c +++ b/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" diff --git a/arch/arm/src/efm32/efm32_timer.h b/arch/arm/src/efm32/efm32_timer.h index 3ed36baad78..ebafbef1ddb 100644 --- a/arch/arm/src/efm32/efm32_timer.h +++ b/arch/arm/src/efm32/efm32_timer.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/efm32_timer.h" +#include "hardware/efm32_timer.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/efm32/efm32_usb.h b/arch/arm/src/efm32/efm32_usb.h index 4f0e25d8d91..9236e7ae37f 100644 --- a/arch/arm/src/efm32/efm32_usb.h +++ b/arch/arm/src/efm32/efm32_usb.h @@ -44,7 +44,7 @@ #include -#include "chip/efm32_usb.h" +#include "hardware/efm32_usb.h" #if defined(CONFIG_EFM32_OTGFS) diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index eedec628e97..e0de5b08fa3 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/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" diff --git a/arch/arm/src/efm32/chip/efm32_acmp.h b/arch/arm/src/efm32/hardware/efm32_acmp.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_acmp.h rename to arch/arm/src/efm32/hardware/efm32_acmp.h index e9956ba8e48..177ac49f556 100644 --- a/arch/arm/src/efm32/chip/efm32_acmp.h +++ b/arch/arm/src/efm32/hardware/efm32_acmp.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_adc.h b/arch/arm/src/efm32/hardware/efm32_adc.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_adc.h rename to arch/arm/src/efm32/hardware/efm32_adc.h index 8245acffab8..2d12977102d 100644 --- a/arch/arm/src/efm32/chip/efm32_adc.h +++ b/arch/arm/src/efm32/hardware/efm32_adc.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_aes.h b/arch/arm/src/efm32/hardware/efm32_aes.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_aes.h rename to arch/arm/src/efm32/hardware/efm32_aes.h index 3376edaec31..dd7f580436d 100644 --- a/arch/arm/src/efm32/chip/efm32_aes.h +++ b/arch/arm/src/efm32/hardware/efm32_aes.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_burtc.h b/arch/arm/src/efm32/hardware/efm32_burtc.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_burtc.h rename to arch/arm/src/efm32/hardware/efm32_burtc.h index 7cdc5cd347a..817f2b74ba9 100644 --- a/arch/arm/src/efm32/chip/efm32_burtc.h +++ b/arch/arm/src/efm32/hardware/efm32_burtc.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_calibrate.h b/arch/arm/src/efm32/hardware/efm32_calibrate.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_calibrate.h rename to arch/arm/src/efm32/hardware/efm32_calibrate.h index 508d0b56e98..f5c21edf6ef 100644 --- a/arch/arm/src/efm32/chip/efm32_calibrate.h +++ b/arch/arm/src/efm32/hardware/efm32_calibrate.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_cmu.h b/arch/arm/src/efm32/hardware/efm32_cmu.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_cmu.h rename to arch/arm/src/efm32/hardware/efm32_cmu.h index ffefddd6939..67780485be2 100644 --- a/arch/arm/src/efm32/chip/efm32_cmu.h +++ b/arch/arm/src/efm32/hardware/efm32_cmu.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_dac.h b/arch/arm/src/efm32/hardware/efm32_dac.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_dac.h rename to arch/arm/src/efm32/hardware/efm32_dac.h index 58aec484dc0..8e8d3e46b8d 100644 --- a/arch/arm/src/efm32/chip/efm32_dac.h +++ b/arch/arm/src/efm32/hardware/efm32_dac.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_devinfo.h b/arch/arm/src/efm32/hardware/efm32_devinfo.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_devinfo.h rename to arch/arm/src/efm32/hardware/efm32_devinfo.h index 024b5b2674a..455a4d7a2cb 100644 --- a/arch/arm/src/efm32/chip/efm32_devinfo.h +++ b/arch/arm/src/efm32/hardware/efm32_devinfo.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_dma.h b/arch/arm/src/efm32/hardware/efm32_dma.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_dma.h rename to arch/arm/src/efm32/hardware/efm32_dma.h index d7ef85e3112..3ede28072c3 100644 --- a/arch/arm/src/efm32/chip/efm32_dma.h +++ b/arch/arm/src/efm32/hardware/efm32_dma.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_emu.h b/arch/arm/src/efm32/hardware/efm32_emu.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_emu.h rename to arch/arm/src/efm32/hardware/efm32_emu.h index 9cd1c67bd9c..9b8c68d1c1f 100644 --- a/arch/arm/src/efm32/chip/efm32_emu.h +++ b/arch/arm/src/efm32/hardware/efm32_emu.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_flash.h b/arch/arm/src/efm32/hardware/efm32_flash.h similarity index 100% rename from arch/arm/src/efm32/chip/efm32_flash.h rename to arch/arm/src/efm32/hardware/efm32_flash.h diff --git a/arch/arm/src/efm32/chip/efm32_gpio.h b/arch/arm/src/efm32/hardware/efm32_gpio.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_gpio.h rename to arch/arm/src/efm32/hardware/efm32_gpio.h index f631de0409e..6f4f9f3b35a 100644 --- a/arch/arm/src/efm32/chip/efm32_gpio.h +++ b/arch/arm/src/efm32/hardware/efm32_gpio.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_i2c.h b/arch/arm/src/efm32/hardware/efm32_i2c.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_i2c.h rename to arch/arm/src/efm32/hardware/efm32_i2c.h index df8382a2a93..c0a5af072ce 100644 --- a/arch/arm/src/efm32/chip/efm32_i2c.h +++ b/arch/arm/src/efm32/hardware/efm32_i2c.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_lcd.h b/arch/arm/src/efm32/hardware/efm32_lcd.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_lcd.h rename to arch/arm/src/efm32/hardware/efm32_lcd.h index f00a4706f3f..62615a35e29 100644 --- a/arch/arm/src/efm32/chip/efm32_lcd.h +++ b/arch/arm/src/efm32/hardware/efm32_lcd.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_lesense.h b/arch/arm/src/efm32/hardware/efm32_lesense.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_lesense.h rename to arch/arm/src/efm32/hardware/efm32_lesense.h index 512a7095bb2..84d48702c16 100644 --- a/arch/arm/src/efm32/chip/efm32_lesense.h +++ b/arch/arm/src/efm32/hardware/efm32_lesense.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_letimer.h b/arch/arm/src/efm32/hardware/efm32_letimer.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_letimer.h rename to arch/arm/src/efm32/hardware/efm32_letimer.h index 3b877d448f1..5d2fa051e9f 100644 --- a/arch/arm/src/efm32/chip/efm32_letimer.h +++ b/arch/arm/src/efm32/hardware/efm32_letimer.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_leuart.h b/arch/arm/src/efm32/hardware/efm32_leuart.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_leuart.h rename to arch/arm/src/efm32/hardware/efm32_leuart.h index be5b1bc0de4..fbf0de77222 100644 --- a/arch/arm/src/efm32/chip/efm32_leuart.h +++ b/arch/arm/src/efm32/hardware/efm32_leuart.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_memorymap.h b/arch/arm/src/efm32/hardware/efm32_memorymap.h similarity index 95% rename from arch/arm/src/efm32/chip/efm32_memorymap.h rename to arch/arm/src/efm32/hardware/efm32_memorymap.h index 62e0a24f820..384927a2c84 100644 --- a/arch/arm/src/efm32/chip/efm32_memorymap.h +++ b/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 diff --git a/arch/arm/src/efm32/chip/efm32_msc.h b/arch/arm/src/efm32/hardware/efm32_msc.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_msc.h rename to arch/arm/src/efm32/hardware/efm32_msc.h index 27b806743ca..f6dd0e08f1f 100644 --- a/arch/arm/src/efm32/chip/efm32_msc.h +++ b/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 diff --git a/arch/arm/src/efm32/chip/efm32_pcnt.h b/arch/arm/src/efm32/hardware/efm32_pcnt.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_pcnt.h rename to arch/arm/src/efm32/hardware/efm32_pcnt.h index e9947f5ba74..1fa10362e67 100644 --- a/arch/arm/src/efm32/chip/efm32_pcnt.h +++ b/arch/arm/src/efm32/hardware/efm32_pcnt.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_prs.h b/arch/arm/src/efm32/hardware/efm32_prs.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_prs.h rename to arch/arm/src/efm32/hardware/efm32_prs.h index b0d8d6e0161..8c83310f760 100644 --- a/arch/arm/src/efm32/chip/efm32_prs.h +++ b/arch/arm/src/efm32/hardware/efm32_prs.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_rmu.h b/arch/arm/src/efm32/hardware/efm32_rmu.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_rmu.h rename to arch/arm/src/efm32/hardware/efm32_rmu.h index e383cce1352..2e34fb59575 100644 --- a/arch/arm/src/efm32/chip/efm32_rmu.h +++ b/arch/arm/src/efm32/hardware/efm32_rmu.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_romtable.h b/arch/arm/src/efm32/hardware/efm32_romtable.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_romtable.h rename to arch/arm/src/efm32/hardware/efm32_romtable.h index 42ed83cbc84..467675c4a80 100644 --- a/arch/arm/src/efm32/chip/efm32_romtable.h +++ b/arch/arm/src/efm32/hardware/efm32_romtable.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_rtc.h b/arch/arm/src/efm32/hardware/efm32_rtc.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_rtc.h rename to arch/arm/src/efm32/hardware/efm32_rtc.h index 044efae971e..0231a6b59dc 100644 --- a/arch/arm/src/efm32/chip/efm32_rtc.h +++ b/arch/arm/src/efm32/hardware/efm32_rtc.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_timer.h b/arch/arm/src/efm32/hardware/efm32_timer.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_timer.h rename to arch/arm/src/efm32/hardware/efm32_timer.h index 86b9aaa51a7..55d23e014a1 100644 --- a/arch/arm/src/efm32/chip/efm32_timer.h +++ b/arch/arm/src/efm32/hardware/efm32_timer.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_usart.h b/arch/arm/src/efm32/hardware/efm32_usart.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_usart.h rename to arch/arm/src/efm32/hardware/efm32_usart.h index 6cd1372c3be..613664eaf80 100644 --- a/arch/arm/src/efm32/chip/efm32_usart.h +++ b/arch/arm/src/efm32/hardware/efm32_usart.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_usb.h b/arch/arm/src/efm32/hardware/efm32_usb.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_usb.h rename to arch/arm/src/efm32/hardware/efm32_usb.h index 92c53e77a62..51213550c0c 100644 --- a/arch/arm/src/efm32/chip/efm32_usb.h +++ b/arch/arm/src/efm32/hardware/efm32_usb.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_vcmp.h b/arch/arm/src/efm32/hardware/efm32_vcmp.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_vcmp.h rename to arch/arm/src/efm32/hardware/efm32_vcmp.h index ec71abd8784..8439fffb726 100644 --- a/arch/arm/src/efm32/chip/efm32_vcmp.h +++ b/arch/arm/src/efm32/hardware/efm32_vcmp.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32_wdog.h b/arch/arm/src/efm32/hardware/efm32_wdog.h similarity index 99% rename from arch/arm/src/efm32/chip/efm32_wdog.h rename to arch/arm/src/efm32/hardware/efm32_wdog.h index 4568dee1593..c01c8c93841 100644 --- a/arch/arm/src/efm32/chip/efm32_wdog.h +++ b/arch/arm/src/efm32/hardware/efm32_wdog.h @@ -66,7 +66,7 @@ *******************************************************************************************************************************/ #include -#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 diff --git a/arch/arm/src/efm32/chip/efm32g_memorymap.h b/arch/arm/src/efm32/hardware/efm32g_memorymap.h similarity index 100% rename from arch/arm/src/efm32/chip/efm32g_memorymap.h rename to arch/arm/src/efm32/hardware/efm32g_memorymap.h diff --git a/arch/arm/src/efm32/chip/efm32gg_memorymap.h b/arch/arm/src/efm32/hardware/efm32gg_memorymap.h similarity index 100% rename from arch/arm/src/efm32/chip/efm32gg_memorymap.h rename to arch/arm/src/efm32/hardware/efm32gg_memorymap.h diff --git a/arch/arm/src/efm32/chip/efm32tg_memorymap.h b/arch/arm/src/efm32/hardware/efm32tg_memorymap.h similarity index 100% rename from arch/arm/src/efm32/chip/efm32tg_memorymap.h rename to arch/arm/src/efm32/hardware/efm32tg_memorymap.h diff --git a/configs/efm32-g8xx-stk/include/board.h b/configs/efm32-g8xx-stk/include/board.h index 55b00720242..4e9c8f0fe8a 100644 --- a/configs/efm32-g8xx-stk/include/board.h +++ b/configs/efm32-g8xx-stk/include/board.h @@ -44,8 +44,8 @@ #include -#include "chip/efm32_cmu.h" -#include "chip/efm32_usart.h" +#include "hardware/efm32_cmu.h" +#include "hardware/efm32_usart.h" /**************************************************************************** * Pre-processor Definitions diff --git a/configs/efm32gg-stk3700/include/board.h b/configs/efm32gg-stk3700/include/board.h index f8816cc9a7a..30543b1622f 100644 --- a/configs/efm32gg-stk3700/include/board.h +++ b/configs/efm32gg-stk3700/include/board.h @@ -44,8 +44,8 @@ #include -#include "chip/efm32_cmu.h" -#include "chip/efm32_usart.h" +#include "hardware/efm32_cmu.h" +#include "hardware/efm32_usart.h" /**************************************************************************** * Pre-processor Definitions diff --git a/configs/olimex-efm32g880f128-stk/include/board.h b/configs/olimex-efm32g880f128-stk/include/board.h index f9c0a2c4ceb..41d3fb6b5b4 100644 --- a/configs/olimex-efm32g880f128-stk/include/board.h +++ b/configs/olimex-efm32g880f128-stk/include/board.h @@ -44,8 +44,8 @@ #include -#include "chip/efm32_cmu.h" -#include "chip/efm32_usart.h" +#include "hardware/efm32_cmu.h" +#include "hardware/efm32_usart.h" /**************************************************************************** * Pre-processor Definitions