diff --git a/arch/arm/src/kinetis/chip.h b/arch/arm/src/kinetis/chip.h index bcb17c2a13d..73206dfcb85 100644 --- a/arch/arm/src/kinetis/chip.h +++ b/arch/arm/src/kinetis/chip.h @@ -48,7 +48,7 @@ #include #include -#include "chip/kinetis_memorymap.h" +#include "hardware/kinetis_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/kinetis/chip/kinetis_adc.h b/arch/arm/src/kinetis/hardware/kinetis_adc.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_adc.h rename to arch/arm/src/kinetis/hardware/kinetis_adc.h index 847bd9b7b73..90dfbd5ac2b 100644 --- a/arch/arm/src/kinetis/chip/kinetis_adc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_adc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_adc.h + * arch/arm/src/kinetis/hardware/kinetis_adc.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ADC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ADC_H /******************************************************************************************** * Included Files @@ -320,4 +320,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ADC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_aips.h b/arch/arm/src/kinetis/hardware/kinetis_aips.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_aips.h rename to arch/arm/src/kinetis/hardware/kinetis_aips.h index a8050fb6139..edde48cea27 100644 --- a/arch/arm/src/kinetis/chip/kinetis_aips.h +++ b/arch/arm/src/kinetis/hardware/kinetis_aips.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_aips.h + * arch/arm/src/kinetis/hardware/kinetis_aips.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AIPS_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AIPS_H /************************************************************************************ * Included Files @@ -214,4 +214,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AIPS_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_axbs.h b/arch/arm/src/kinetis/hardware/kinetis_axbs.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_axbs.h rename to arch/arm/src/kinetis/hardware/kinetis_axbs.h index 7aab308593c..50399f4365e 100644 --- a/arch/arm/src/kinetis/chip/kinetis_axbs.h +++ b/arch/arm/src/kinetis/hardware/kinetis_axbs.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_axbs.h + * arch/arm/src/kinetis/hardware/kinetis_axbs.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AXBS_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AXBS_H /************************************************************************************ * Included Files @@ -248,4 +248,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AXBS_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_cmp.h b/arch/arm/src/kinetis/hardware/kinetis_cmp.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_cmp.h rename to arch/arm/src/kinetis/hardware/kinetis_cmp.h index 09e9eb19f6a..e0cf6a09639 100644 --- a/arch/arm/src/kinetis/chip/kinetis_cmp.h +++ b/arch/arm/src/kinetis/hardware/kinetis_cmp.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_cmp.h + * arch/arm/src/kinetis/hardware/kinetis_cmp.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMP_H /******************************************************************************************** * Included Files @@ -189,4 +189,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_cmt.h b/arch/arm/src/kinetis/hardware/kinetis_cmt.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_cmt.h rename to arch/arm/src/kinetis/hardware/kinetis_cmt.h index e86720db91e..ca988deee1e 100644 --- a/arch/arm/src/kinetis/chip/kinetis_cmt.h +++ b/arch/arm/src/kinetis/hardware/kinetis_cmt.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_cmt.h + * arch/arm/src/kinetis/hardware/kinetis_cmt.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMT_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMT_H /************************************************************************************ * Included Files @@ -135,4 +135,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMT_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_crc.h b/arch/arm/src/kinetis/hardware/kinetis_crc.h similarity index 96% rename from arch/arm/src/kinetis/chip/kinetis_crc.h rename to arch/arm/src/kinetis/hardware/kinetis_crc.h index d2f0fc7fddb..bbde430513b 100644 --- a/arch/arm/src/kinetis/chip/kinetis_crc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_crc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_crc.h + * arch/arm/src/kinetis/hardware/kinetis_crc.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CRC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CRC_H /************************************************************************************ * Included Files @@ -114,4 +114,4 @@ ************************************************************************************/ #endif /* KINETIS_NCRC && KINETIS_NCRC > 0 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CRC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_dac.h b/arch/arm/src/kinetis/hardware/kinetis_dac.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_dac.h rename to arch/arm/src/kinetis/hardware/kinetis_dac.h index bf218438263..bf41f77a6bf 100644 --- a/arch/arm/src/kinetis/chip/kinetis_dac.h +++ b/arch/arm/src/kinetis/hardware/kinetis_dac.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_dac.h + * arch/arm/src/kinetis/hardware/kinetis_dac.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DAC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DAC_H /******************************************************************************************** * Included Files @@ -232,4 +232,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DAC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_dma.h b/arch/arm/src/kinetis/hardware/kinetis_dma.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_dma.h rename to arch/arm/src/kinetis/hardware/kinetis_dma.h index 8598e81185e..6529f236b8a 100644 --- a/arch/arm/src/kinetis/chip/kinetis_dma.h +++ b/arch/arm/src/kinetis/hardware/kinetis_dma.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_dma.h + * arch/arm/src/kinetis/hardware/kinetis_dma.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMA_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMA_H /**************************************************************************************************** * Included Files @@ -779,4 +779,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMA_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_dmamux.h b/arch/arm/src/kinetis/hardware/kinetis_dmamux.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_dmamux.h rename to arch/arm/src/kinetis/hardware/kinetis_dmamux.h index 20b3ed18256..d214d0da753 100644 --- a/arch/arm/src/kinetis/chip/kinetis_dmamux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_dmamux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_dmamux.h + * arch/arm/src/kinetis/hardware/kinetis_dmamux.h * * Copyright (C) 2011, 2016, 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMAMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMAMUX_H /******************************************************************************************** * Included Files @@ -270,4 +270,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMAMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_dspi.h b/arch/arm/src/kinetis/hardware/kinetis_dspi.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_dspi.h rename to arch/arm/src/kinetis/hardware/kinetis_dspi.h index 897e766cfcf..70dbd308f30 100644 --- a/arch/arm/src/kinetis/chip/kinetis_dspi.h +++ b/arch/arm/src/kinetis/hardware/kinetis_dspi.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_dspi.h + * arch/arm/src/kinetis/hardware/kinetis_dspi.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DSPI_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DSPI_H /******************************************************************************************** * Included Files @@ -322,4 +322,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DSPI_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_enet.h b/arch/arm/src/kinetis/hardware/kinetis_enet.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_enet.h rename to arch/arm/src/kinetis/hardware/kinetis_enet.h index 8f34d0c7f64..af8609bab41 100644 --- a/arch/arm/src/kinetis/chip/kinetis_enet.h +++ b/arch/arm/src/kinetis/hardware/kinetis_enet.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_enet.h + * arch/arm/src/kinetis/hardware/kinetis_enet.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ENET_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ENET_H /******************************************************************************************** * Included Files @@ -649,4 +649,4 @@ struct enet_desc_s ********************************************************************************************/ #endif /* KINETIS_NENET && KINETIS_NENET > 0 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ENET_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_ewm.h b/arch/arm/src/kinetis/hardware/kinetis_ewm.h similarity index 95% rename from arch/arm/src/kinetis/chip/kinetis_ewm.h rename to arch/arm/src/kinetis/hardware/kinetis_ewm.h index e91bc28c2c6..2e3f101cd54 100644 --- a/arch/arm/src/kinetis/chip/kinetis_ewm.h +++ b/arch/arm/src/kinetis/hardware/kinetis_ewm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_ewm.h + * arch/arm/src/kinetis/hardware/kinetis_ewm.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_EWM_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_EWM_H /************************************************************************************ * Included Files @@ -87,4 +87,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_EWM_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_flexbus.h b/arch/arm/src/kinetis/hardware/kinetis_flexbus.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_flexbus.h rename to arch/arm/src/kinetis/hardware/kinetis_flexbus.h index 7c063d08697..a52e2027f78 100644 --- a/arch/arm/src/kinetis/chip/kinetis_flexbus.h +++ b/arch/arm/src/kinetis/hardware/kinetis_flexbus.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_flexbus.h + * arch/arm/src/kinetis/hardware/kinetis_flexbus.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXBUS_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXBUS_H /************************************************************************************ * Included Files @@ -210,4 +210,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXBUS_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_flexcan.h b/arch/arm/src/kinetis/hardware/kinetis_flexcan.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_flexcan.h rename to arch/arm/src/kinetis/hardware/kinetis_flexcan.h index 2463eb6b71e..32f4fad1106 100644 --- a/arch/arm/src/kinetis/chip/kinetis_flexcan.h +++ b/arch/arm/src/kinetis/hardware/kinetis_flexcan.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_flexcan.h + * arch/arm/src/kinetis/hardware/kinetis_flexcan.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXCAN_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXCAN_H /**************************************************************************************************** * Included Files @@ -315,4 +315,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXCAN_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_fmc.h b/arch/arm/src/kinetis/hardware/kinetis_fmc.h similarity index 90% rename from arch/arm/src/kinetis/chip/kinetis_fmc.h rename to arch/arm/src/kinetis/hardware/kinetis_fmc.h index b3bfd18c0b1..a48b621adaa 100644 --- a/arch/arm/src/kinetis/chip/kinetis_fmc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_fmc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_fmc.h + * arch/arm/src/kinetis/hardware/kinetis_fmc.h * * Copyright (C) 2016, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FMC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FMC_H /******************************************************************************************** * Included Files @@ -49,11 +49,11 @@ */ #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60) -# include "chip/kinetis_k20k40k60fmc.h" +# include "hardware/kinetis_k20k40k60fmc.h" #elif defined(KINETIS_K64) -# include "chip/kinetis_k64fmc.h" +# include "hardware/kinetis_k64fmc.h" #elif defined(KINETIS_K28) || defined(KINETIS_K66) -# include "chip/kinetis_k28k66fmc.h" +# include "hardware/kinetis_k28k66fmc.h" #else # error "No FMC definitions for this Kinetis part" #endif @@ -74,4 +74,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FMC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_ftfe.h b/arch/arm/src/kinetis/hardware/kinetis_ftfe.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_ftfe.h rename to arch/arm/src/kinetis/hardware/kinetis_ftfe.h index 13794d97dbe..dad9e120a9a 100644 --- a/arch/arm/src/kinetis/chip/kinetis_ftfe.h +++ b/arch/arm/src/kinetis/hardware/kinetis_ftfe.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_ftfe.h + * arch/arm/src/kinetis/hardware/kinetis_ftfe.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTFE_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTFE_H /************************************************************************************ * Included Files @@ -156,4 +156,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTFE_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_ftm.h b/arch/arm/src/kinetis/hardware/kinetis_ftm.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_ftm.h rename to arch/arm/src/kinetis/hardware/kinetis_ftm.h index 1402f5e8d8a..bdbe30d119c 100644 --- a/arch/arm/src/kinetis/chip/kinetis_ftm.h +++ b/arch/arm/src/kinetis/hardware/kinetis_ftm.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_ftm.h + * arch/arm/src/kinetis/hardware/kinetis_ftm.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTM_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTM_H /******************************************************************************************** * Included Files @@ -569,4 +569,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTM_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_gpio.h b/arch/arm/src/kinetis/hardware/kinetis_gpio.h similarity index 96% rename from arch/arm/src/kinetis/chip/kinetis_gpio.h rename to arch/arm/src/kinetis/hardware/kinetis_gpio.h index 1d3d10553fb..09e205a2c2e 100644 --- a/arch/arm/src/kinetis/chip/kinetis_gpio.h +++ b/arch/arm/src/kinetis/hardware/kinetis_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/kinetis_gpio.h + * arch/arm/src/kinetis/hardware/kinetis_gpio.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_GPIO_H -#define __ARCH_ARM_SRC_KINETIS_KINETIS_GPIO_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_GPIO_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_GPIO_H /************************************************************************************ * Included Files @@ -139,4 +139,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_GPIO_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_GPIO_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_i2c.h b/arch/arm/src/kinetis/hardware/kinetis_i2c.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_i2c.h rename to arch/arm/src/kinetis/hardware/kinetis_i2c.h index 95cd965ca84..d2e007b10bb 100644 --- a/arch/arm/src/kinetis/chip/kinetis_i2c.h +++ b/arch/arm/src/kinetis/hardware/kinetis_i2c.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_i2c.h + * arch/arm/src/kinetis/hardware/kinetis_i2c.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H /******************************************************************************************** * Included Files @@ -292,4 +292,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_i2s.h b/arch/arm/src/kinetis/hardware/kinetis_i2s.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_i2s.h rename to arch/arm/src/kinetis/hardware/kinetis_i2s.h index 5de08843bb0..c223ada35c6 100644 --- a/arch/arm/src/kinetis/chip/kinetis_i2s.h +++ b/arch/arm/src/kinetis/hardware/kinetis_i2s.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_i2s.h + * arch/arm/src/kinetis/hardware/kinetis_i2s.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2S_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2S_H /**************************************************************************************************** * Included Files @@ -294,4 +294,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2S_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k20k40k60fmc.h b/arch/arm/src/kinetis/hardware/kinetis_k20k40k60fmc.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k20k40k60fmc.h rename to arch/arm/src/kinetis/hardware/kinetis_k20k40k60fmc.h index 8dce4d682ef..a8cf0ac2835 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k20k40k60fmc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k20k40k60fmc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/kinetis_k20k40k60fmc.h + * arch/arm/src/kinetis/hardware/kinetis_k20k40k60fmc.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20K40K60FMC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20K40K60FMC_H /************************************************************************************ * Included Files @@ -386,4 +386,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20K40K60FMC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k20k40k60mpu.h b/arch/arm/src/kinetis/hardware/kinetis_k20k40k60mpu.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k20k40k60mpu.h rename to arch/arm/src/kinetis/hardware/kinetis_k20k40k60mpu.h index f2b1bf91433..34aa7e5ab2f 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k20k40k60mpu.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k20k40k60mpu.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/kinetis_mpu.h + * arch/arm/src/kinetis/hardware/kinetis_mpu.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H -#define __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H /**************************************************************************************************** * Included Files @@ -395,4 +395,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k20memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_k20memorymap.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_k20memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_k20memorymap.h index c21ba4d0985..144dafea121 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k20memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k20memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_k20memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_k20memorymap.h * * Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20MEMORYMAP_H /************************************************************************************ * Included Files @@ -177,4 +177,4 @@ ************************************************************************************/ #endif /* KINETIS_K20 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k20pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_k20pinmux.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_k20pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_k20pinmux.h index d77ea962704..647240db989 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k20pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k20pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k20pinmux.h + * arch/arm/src/kinetis/hardware/kinetis_k20pinmux.h * * Copyright (C) 2015-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20PINMUX_H /******************************************************************************************** * Included Files @@ -350,4 +350,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k28k64k66mpu.h b/arch/arm/src/kinetis/hardware/kinetis_k28k64k66mpu.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k28k64k66mpu.h rename to arch/arm/src/kinetis/hardware/kinetis_k28k64k66mpu.h index 0e500e84bb4..650026b9192 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k28k64k66mpu.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k28k64k66mpu.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k28k64k66mpu.h + * arch/arm/src/kinetis/hardware/kinetis_k28k64k66mpu.h * * Copyright (C) 2011, 2017-2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K64K66MPU_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K64K66MPU_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K64K66MPU_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K64K66MPU_H /**************************************************************************************************** * Included Files @@ -388,4 +388,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K64K66MPU_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K64K66MPU_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k28k66fmc.h b/arch/arm/src/kinetis/hardware/kinetis_k28k66fmc.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k28k66fmc.h rename to arch/arm/src/kinetis/hardware/kinetis_k28k66fmc.h index 5f95bf99c1a..f4efeb64151 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k28k66fmc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k28k66fmc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/kinetis_k28k66fmc.h + * arch/arm/src/kinetis/hardware/kinetis_k28k66fmc.h * * Copyright (C) 2016-2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K66FMC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K66FMC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K66FMC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K66FMC_H /************************************************************************************ * Included Files @@ -361,4 +361,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K66FMC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K66FMC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k28memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_k28memorymap.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_k28memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_k28memorymap.h index 47b4c7239ff..89b02b8c026 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k28memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k28memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_k28memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_k28memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28MEMORYMAP_H /************************************************************************************ * Included Files @@ -226,4 +226,4 @@ ************************************************************************************/ #endif /* KINETIS_K28 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k28pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_k28pinmux.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k28pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_k28pinmux.h index dc5400a5aa2..8ee6fe3b37e 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k28pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k28pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k28pinmux.h + * arch/arm/src/kinetis/hardware/kinetis_k28pinmux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K28PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K28PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28PINMUX_H /******************************************************************************************** * Included Files @@ -830,4 +830,4 @@ ********************************************************************************************/ #endif /* KINETIS_K28 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K28PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k40memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_k40memorymap.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_k40memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_k40memorymap.h index 68ce4e4a06c..35e0095faa2 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k40memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k40memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_k40memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_k40memorymap.h * * Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40MEMORYMAP_H /************************************************************************************ * Included Files @@ -196,4 +196,4 @@ ************************************************************************************/ #endif /* KINETIS_K40 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k40pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_k40pinmux.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k40pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_k40pinmux.h index c7570edaf9a..2a34264acaf 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k40pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k40pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k40pinmux.h + * arch/arm/src/kinetis/hardware/kinetis_k40pinmux.h * * Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40PINMUX_H /******************************************************************************************** * Included Files @@ -516,4 +516,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_k60memorymap.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_k60memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_k60memorymap.h index 0dc6888faee..e78c3efe20b 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k60memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_k60memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_k60memorymap.h * * Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60MEMORYMAP_H /************************************************************************************ * Included Files @@ -193,4 +193,4 @@ ************************************************************************************/ #endif /* KINETIS_K60 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_k60pinmux.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k60pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_k60pinmux.h index b1ca87746f3..bb727a6f620 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k60pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k60pinset.h + * arch/arm/src/kinetis/hardware/kinetis_k60pinset.h * * Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60PINMUX_H /******************************************************************************************** * Included Files @@ -484,4 +484,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k64fmc.h b/arch/arm/src/kinetis/hardware/kinetis_k64fmc.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_k64fmc.h rename to arch/arm/src/kinetis/hardware/kinetis_k64fmc.h index 036e38f1299..5aec3d34ec5 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k64fmc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k64fmc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/kinetis_k64fmc.h + * arch/arm/src/kinetis/hardware/kinetis_k64fmc.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64FMC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64FMC_H /************************************************************************************ * Included Files @@ -290,4 +290,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64FMC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_k64memorymap.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_k64memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_k64memorymap.h index 247063981c5..7a8a86ca624 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k64memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_k64memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_k64memorymap.h * * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64MEMORYMAP_H /************************************************************************************ * Included Files @@ -210,4 +210,4 @@ ************************************************************************************/ #endif /* KINETIS_K64 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_k64pinmux.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k64pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_k64pinmux.h index d9894b3ff70..d44541c9fde 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k64pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k64pinmux.h + * arch/arm/src/kinetis/hardware/kinetis_k64pinmux.h * * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64PINMUX_H /******************************************************************************************** * Included Files @@ -638,4 +638,4 @@ ********************************************************************************************/ #endif /* KINETIS_K64 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k66memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_k66memorymap.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_k66memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_k66memorymap.h index 629b2140360..c2d0c7655f2 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k66memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k66memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_k66memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_k66memorymap.h * * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K66MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K66MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66MEMORYMAP_H /************************************************************************************ * Included Files @@ -238,4 +238,4 @@ ************************************************************************************/ #endif /* KINETIS_K66 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K66MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_k66pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_k66pinmux.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_k66pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_k66pinmux.h index 178b700feba..7a572229604 100644 --- a/arch/arm/src/kinetis/chip/kinetis_k66pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_k66pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_k66pinmux.h + * arch/arm/src/kinetis/hardware/kinetis_k66pinmux.h * * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K66PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K66PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66PINMUX_H /******************************************************************************************** * Included Files @@ -759,4 +759,4 @@ ********************************************************************************************/ #endif /* KINETIS_K66 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K66PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_kx6tpm.h b/arch/arm/src/kinetis/hardware/kinetis_kx6tpm.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_kx6tpm.h rename to arch/arm/src/kinetis/hardware/kinetis_kx6tpm.h index 2dd103c6566..00f81f54f9a 100644 --- a/arch/arm/src/kinetis/chip/kinetis_kx6tpm.h +++ b/arch/arm/src/kinetis/hardware/kinetis_kx6tpm.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_kx6tpm.h + * arch/arm/src/kinetis/hardware/kinetis_kx6tpm.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_KX6TPM_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_KX6TPM_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_KX6TPM_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_KX6TPM_H /**************************************************************************** * Included Files @@ -208,4 +208,4 @@ # define TPM_CONF_TRGSEL_LPTMR (14 << TPM_CONF_TRGSEL_SHIFT) /* LPTMR trigger */ # define TPM_CONF_TRGSEL_SW (15 << TPM_CONF_TRGSEL_SHIFT) /* Software Trigger */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_KX6TPM_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_KX6TPM_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_llwu.h b/arch/arm/src/kinetis/hardware/kinetis_llwu.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_llwu.h rename to arch/arm/src/kinetis/hardware/kinetis_llwu.h index c4abaa74ddf..9f13500d0ca 100644 --- a/arch/arm/src/kinetis/chip/kinetis_llwu.h +++ b/arch/arm/src/kinetis/hardware/kinetis_llwu.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_llwu.h + * arch/arm/src/kinetis/hardware/kinetis_llwu.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LLWU_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LLWU_H /************************************************************************************ * Included Files @@ -251,4 +251,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LLWU_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_lptmr.h b/arch/arm/src/kinetis/hardware/kinetis_lptmr.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_lptmr.h rename to arch/arm/src/kinetis/hardware/kinetis_lptmr.h index f89aee13176..c953ff5c60c 100644 --- a/arch/arm/src/kinetis/chip/kinetis_lptmr.h +++ b/arch/arm/src/kinetis/hardware/kinetis_lptmr.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_lptmr.h + * arch/arm/src/kinetis/hardware/kinetis_lptmr.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPTMR_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPTMR_H /**************************************************************************************************** * Included Files @@ -135,4 +135,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPTMR_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_lpuart.h b/arch/arm/src/kinetis/hardware/kinetis_lpuart.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_lpuart.h rename to arch/arm/src/kinetis/hardware/kinetis_lpuart.h index 5c373b5637a..876ab95e350 100644 --- a/arch/arm/src/kinetis/chip/kinetis_lpuart.h +++ b/arch/arm/src/kinetis/hardware/kinetis_lpuart.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_lpuart.h + * arch/arm/src/kinetis/hardware/kinetis_lpuart.h * * Copyright (C) 2017-2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPUART_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPUART_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPUART_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPUART_H /**************************************************************************************************** * Included Files @@ -353,4 +353,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPUART_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPUART_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_mcg.h b/arch/arm/src/kinetis/hardware/kinetis_mcg.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_mcg.h rename to arch/arm/src/kinetis/hardware/kinetis_mcg.h index 6b7798c4f73..d2b140606b1 100644 --- a/arch/arm/src/kinetis/chip/kinetis_mcg.h +++ b/arch/arm/src/kinetis/hardware/kinetis_mcg.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_mcg.h + * arch/arm/src/kinetis/hardware/kinetis_mcg.h * * Copyright (C) 2011, 2016-2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCG_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCG_H /************************************************************************************ * Included Files @@ -436,4 +436,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCG_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_mcm.h b/arch/arm/src/kinetis/hardware/kinetis_mcm.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_mcm.h rename to arch/arm/src/kinetis/hardware/kinetis_mcm.h index f46305056ef..f7a8e9d3ee0 100644 --- a/arch/arm/src/kinetis/chip/kinetis_mcm.h +++ b/arch/arm/src/kinetis/hardware/kinetis_mcm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_mcm.h + * arch/arm/src/kinetis/hardware/kinetis_mcm.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCM_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCM_H /************************************************************************************ * Included Files @@ -154,4 +154,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCM_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_memorymap.h b/arch/arm/src/kinetis/hardware/kinetis_memorymap.h similarity index 86% rename from arch/arm/src/kinetis/chip/kinetis_memorymap.h rename to arch/arm/src/kinetis/hardware/kinetis_memorymap.h index 853edaa712d..dfd008684ac 100644 --- a/arch/arm/src/kinetis/chip/kinetis_memorymap.h +++ b/arch/arm/src/kinetis/hardware/kinetis_memorymap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_memorymap.h + * arch/arm/src/kinetis/hardware/kinetis_memorymap.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MEMORYMAP_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MEMORYMAP_H /******************************************************************************************** * Included Files @@ -49,17 +49,17 @@ */ #if defined(KINETIS_K20) -# include "chip/kinetis_k20memorymap.h" +# include "hardware/kinetis_k20memorymap.h" #elif defined(KINETIS_K28) -# include "chip/kinetis_k28memorymap.h" +# include "hardware/kinetis_k28memorymap.h" #elif defined(KINETIS_K40) -# include "chip/kinetis_k40memorymap.h" +# include "hardware/kinetis_k40memorymap.h" #elif defined(KINETIS_K60) -# include "chip/kinetis_k60memorymap.h" +# include "hardware/kinetis_k60memorymap.h" #elif defined(KINETIS_K64) -# include "chip/kinetis_k64memorymap.h" +# include "hardware/kinetis_k64memorymap.h" #elif defined(KINETIS_K66) -# include "chip/kinetis_k66memorymap.h" +# include "hardware/kinetis_k66memorymap.h" #else # error "No memory map for this Kinetis part" #endif @@ -80,4 +80,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MEMORYMAP_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_mmcau.h b/arch/arm/src/kinetis/hardware/kinetis_mmcau.h similarity index 96% rename from arch/arm/src/kinetis/chip/kinetis_mmcau.h rename to arch/arm/src/kinetis/hardware/kinetis_mmcau.h index 90c9cf6552c..2cc645a32d1 100644 --- a/arch/arm/src/kinetis/chip/kinetis_mmcau.h +++ b/arch/arm/src/kinetis/hardware/kinetis_mmcau.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_mmcau.h + * arch/arm/src/kinetis/hardware/kinetis_mmcau.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MMCAU_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MMCAU_H /************************************************************************************ * Included Files @@ -139,4 +139,4 @@ ************************************************************************************/ #endif /* KINETIS_NMMCAU && KINETIS_NMMCAU > 0 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MMCAU_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_mpu.h b/arch/arm/src/kinetis/hardware/kinetis_mpu.h similarity index 91% rename from arch/arm/src/kinetis/chip/kinetis_mpu.h rename to arch/arm/src/kinetis/hardware/kinetis_mpu.h index 9aa4b097c45..01cabaa1068 100644 --- a/arch/arm/src/kinetis/chip/kinetis_mpu.h +++ b/arch/arm/src/kinetis/hardware/kinetis_mpu.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_mpu.h + * arch/arm/src/kinetis/hardware/kinetis_mpu.h * * Copyright (C) 2016, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H /******************************************************************************************** * Included Files @@ -49,9 +49,9 @@ */ #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60) -# include "chip/kinetis_k20k40k60mpu.h" +# include "hardware/kinetis_k20k40k60mpu.h" #elif defined(KINETIS_K28) || defined(KINETIS_K64) || defined(KINETIS_K66) -# include "chip/kinetis_k28k64k66mpu.h" +# include "hardware/kinetis_k28k64k66mpu.h" #else # error "No MPU definitions for this Kinetis part" #endif @@ -72,4 +72,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_osc.h b/arch/arm/src/kinetis/hardware/kinetis_osc.h similarity index 95% rename from arch/arm/src/kinetis/chip/kinetis_osc.h rename to arch/arm/src/kinetis/hardware/kinetis_osc.h index e61f0a8c1c6..7bb5077a082 100644 --- a/arch/arm/src/kinetis/chip/kinetis_osc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_osc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_osc.h + * arch/arm/src/kinetis/hardware/kinetis_osc.h * * Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H -#define __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_OSC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_OSC_H /******************************************************************************************** * Included Files @@ -92,4 +92,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_OSC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_pdb.h b/arch/arm/src/kinetis/hardware/kinetis_pdb.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_pdb.h rename to arch/arm/src/kinetis/hardware/kinetis_pdb.h index d0238240dfa..59450c839fa 100644 --- a/arch/arm/src/kinetis/chip/kinetis_pdb.h +++ b/arch/arm/src/kinetis/hardware/kinetis_pdb.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_pdb.h + * arch/arm/src/kinetis/hardware/kinetis_pdb.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PDB_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PDB_H /******************************************************************************************** * Included Files @@ -260,4 +260,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PDB_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_pinmux.h b/arch/arm/src/kinetis/hardware/kinetis_pinmux.h similarity index 87% rename from arch/arm/src/kinetis/chip/kinetis_pinmux.h rename to arch/arm/src/kinetis/hardware/kinetis_pinmux.h index b94133b83a8..1b5cb3d28c0 100644 --- a/arch/arm/src/kinetis/chip/kinetis_pinmux.h +++ b/arch/arm/src/kinetis/hardware/kinetis_pinmux.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_pinmux.h + * arch/arm/src/kinetis/hardware/kinetis_pinmux.h * * Copyright (C) 2011, 2015-2016, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PINMUX_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PINMUX_H /******************************************************************************************** * Included Files @@ -49,17 +49,17 @@ */ #if defined(KINETIS_K20) -# include "chip/kinetis_k20pinmux.h" +# include "hardware/kinetis_k20pinmux.h" #elif defined(KINETIS_K28) -# include "chip/kinetis_k28pinmux.h" +# include "hardware/kinetis_k28pinmux.h" #elif defined(KINETIS_K40) -# include "chip/kinetis_k40pinmux.h" +# include "hardware/kinetis_k40pinmux.h" #elif defined(KINETIS_K60) -# include "chip/kinetis_k60pinmux.h" +# include "hardware/kinetis_k60pinmux.h" #elif defined(KINETIS_K64) -# include "chip/kinetis_k64pinmux.h" +# include "hardware/kinetis_k64pinmux.h" #elif defined(KINETIS_K66) -# include "chip/kinetis_k66pinmux.h" +# include "hardware/kinetis_k66pinmux.h" #else # error "No pin multiplexing for this Kinetis part" #endif @@ -80,4 +80,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PINMUX_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_pit.h b/arch/arm/src/kinetis/hardware/kinetis_pit.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_pit.h rename to arch/arm/src/kinetis/hardware/kinetis_pit.h index 5ccd110a36c..e2f4b37414c 100644 --- a/arch/arm/src/kinetis/chip/kinetis_pit.h +++ b/arch/arm/src/kinetis/hardware/kinetis_pit.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_pit.h + * arch/arm/src/kinetis/hardware/kinetis_pit.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PIT_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PIT_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PIT_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PIT_H /************************************************************************************ * Included Files @@ -138,4 +138,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PIT_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PIT_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_pmc.h b/arch/arm/src/kinetis/hardware/kinetis_pmc.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_pmc.h rename to arch/arm/src/kinetis/hardware/kinetis_pmc.h index 549ce84d935..1c20902cbca 100644 --- a/arch/arm/src/kinetis/chip/kinetis_pmc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_pmc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_pmc.h + * arch/arm/src/kinetis/hardware/kinetis_pmc.h * * Copyright (C) 2011, 2016, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PMC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PMC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PMC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PMC_H /******************************************************************************************** * Included Files @@ -150,4 +150,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PMC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PMC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_port.h b/arch/arm/src/kinetis/hardware/kinetis_port.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_port.h rename to arch/arm/src/kinetis/hardware/kinetis_port.h index 36dfa4e0983..c8109dcacb8 100644 --- a/arch/arm/src/kinetis/chip/kinetis_port.h +++ b/arch/arm/src/kinetis/hardware/kinetis_port.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_port.h + * arch/arm/src/kinetis/hardware/kinetis_port.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PORT_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PORT_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PORT_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PORT_H /************************************************************************************ * Included Files @@ -426,4 +426,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PORT_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PORT_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_rngb.h b/arch/arm/src/kinetis/hardware/kinetis_rngb.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_rngb.h rename to arch/arm/src/kinetis/hardware/kinetis_rngb.h index 1e005c08ae3..7c64b37bfb2 100644 --- a/arch/arm/src/kinetis/chip/kinetis_rngb.h +++ b/arch/arm/src/kinetis/hardware/kinetis_rngb.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_rngb.h + * arch/arm/src/kinetis/hardware/kinetis_rngb.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RNGB_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RNGB_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_RNGB_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_RNGB_H /************************************************************************************ * Included Files @@ -158,4 +158,4 @@ ************************************************************************************/ #endif /* KINETIS_NRNG && KINETIS_NRNG > 0 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RNGB_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_RNGB_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_rtc.h b/arch/arm/src/kinetis/hardware/kinetis_rtc.h similarity index 98% rename from arch/arm/src/kinetis/chip/kinetis_rtc.h rename to arch/arm/src/kinetis/hardware/kinetis_rtc.h index 4ad016af6c0..11abeb16ff7 100644 --- a/arch/arm/src/kinetis/chip/kinetis_rtc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_rtc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_rtc.h + * arch/arm/src/kinetis/hardware/kinetis_rtc.h * * Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RTC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RTC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_RTC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_RTC_H /************************************************************************************ * Included Files @@ -274,4 +274,4 @@ ************************************************************************************/ #endif /* KINETIS_NRTC && KINETIS_NRTC > 0 */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RTC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_RTC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_sdhc.h b/arch/arm/src/kinetis/hardware/kinetis_sdhc.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_sdhc.h rename to arch/arm/src/kinetis/hardware/kinetis_sdhc.h index b57b85c94e7..f20e39f1a70 100644 --- a/arch/arm/src/kinetis/chip/kinetis_sdhc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_sdhc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_sdhc.h + * arch/arm/src/kinetis/hardware/kinetis_sdhc.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SDHC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SDHC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SDHC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SDHC_H /************************************************************************************ * Included Files @@ -385,4 +385,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SDHC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SDHC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_sim.h b/arch/arm/src/kinetis/hardware/kinetis_sim.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_sim.h rename to arch/arm/src/kinetis/hardware/kinetis_sim.h index 87dd39def75..8dddb9e1046 100644 --- a/arch/arm/src/kinetis/chip/kinetis_sim.h +++ b/arch/arm/src/kinetis/hardware/kinetis_sim.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_sim.h + * arch/arm/src/kinetis/hardware/kinetis_sim.h * * Copyright (C) 2011, 2016-2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SIM_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SIM_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SIM_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SIM_H /************************************************************************************ * Included Files @@ -1397,4 +1397,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SIM_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SIM_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_slcd.h b/arch/arm/src/kinetis/hardware/kinetis_slcd.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_slcd.h rename to arch/arm/src/kinetis/hardware/kinetis_slcd.h index d4a68f07f5a..77a85856906 100644 --- a/arch/arm/src/kinetis/chip/kinetis_slcd.h +++ b/arch/arm/src/kinetis/hardware/kinetis_slcd.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_slcd.h + * arch/arm/src/kinetis/hardware/kinetis_slcd.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SLCD_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SLCD_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SLCD_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SLCD_H /************************************************************************************ * Included Files @@ -417,4 +417,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SLCD_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SLCD_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_smc.h b/arch/arm/src/kinetis/hardware/kinetis_smc.h similarity index 96% rename from arch/arm/src/kinetis/chip/kinetis_smc.h rename to arch/arm/src/kinetis/hardware/kinetis_smc.h index 19a9d9d14b8..5ab568bd382 100644 --- a/arch/arm/src/kinetis/chip/kinetis_smc.h +++ b/arch/arm/src/kinetis/hardware/kinetis_smc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_smc.h + * arch/arm/src/kinetis/hardware/kinetis_smc.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SMC_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SMC_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SMC_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SMC_H /************************************************************************************ * Included Files @@ -119,4 +119,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SMC_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_SMC_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_tsi.h b/arch/arm/src/kinetis/hardware/kinetis_tsi.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_tsi.h rename to arch/arm/src/kinetis/hardware/kinetis_tsi.h index 6881150160f..fa4439136d1 100644 --- a/arch/arm/src/kinetis/chip/kinetis_tsi.h +++ b/arch/arm/src/kinetis/hardware/kinetis_tsi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_tsi.h + * arch/arm/src/kinetis/hardware/kinetis_tsi.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_TSI_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_TSI_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_TSI_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_TSI_H /************************************************************************************ * Included Files @@ -308,4 +308,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_TSI_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_TSI_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_uart.h b/arch/arm/src/kinetis/hardware/kinetis_uart.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_uart.h rename to arch/arm/src/kinetis/hardware/kinetis_uart.h index d7296ce7066..8331a32ff87 100644 --- a/arch/arm/src/kinetis/chip/kinetis_uart.h +++ b/arch/arm/src/kinetis/hardware/kinetis_uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_uart.h + * arch/arm/src/kinetis/hardware/kinetis_uart.h * * Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_UART_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_UART_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_UART_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_UART_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include -#include "chip/kinetis_memorymap.h" +#include "hardware/kinetis_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -509,4 +509,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_UART_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_UART_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_usbdcd.h b/arch/arm/src/kinetis/hardware/kinetis_usbdcd.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_usbdcd.h rename to arch/arm/src/kinetis/hardware/kinetis_usbdcd.h index 6c4297ff7af..b0ca7e5315e 100644 --- a/arch/arm/src/kinetis/chip/kinetis_usbdcd.h +++ b/arch/arm/src/kinetis/hardware/kinetis_usbdcd.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/kinetis/chip/kinetis_usbdcd.h + * arch/arm/src/kinetis/hardware/kinetis_usbdcd.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBDCD_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBDCD_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBDCD_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBDCD_H /************************************************************************************ * Included Files @@ -148,4 +148,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBDCD_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBDCD_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_usbhs.h b/arch/arm/src/kinetis/hardware/kinetis_usbhs.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_usbhs.h rename to arch/arm/src/kinetis/hardware/kinetis_usbhs.h index 097b8d2f8c6..539f91c8bd6 100644 --- a/arch/arm/src/kinetis/chip/kinetis_usbhs.h +++ b/arch/arm/src/kinetis/hardware/kinetis_usbhs.h @@ -1,5 +1,5 @@ /******************************************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_usbhs.h + * arch/arm/src/kinetis/hardware/kinetis_usbhs.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ******************************************************************************************************************* */ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBHS_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBHS_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBHS_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBHS_H /******************************************************************************************************************** * Included Files @@ -951,4 +951,4 @@ #define USBPHY_TRIM_OVERRIDE_ENn_TRIM_ENV_TAIL_ADJ_VD_OVERRIDE (1 << 1) /* Bit 1: Override enable for ENV_TAIL_ADJ */ #define USBPHY_TRIM_OVERRIDE_ENn_TRIM_DIV_SEL_OVERRIDE (1 << 0) /* Bit 0: Override enable for PLL_DIV_SEL */ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBHS_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBHS_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_usbotg.h b/arch/arm/src/kinetis/hardware/kinetis_usbotg.h similarity index 99% rename from arch/arm/src/kinetis/chip/kinetis_usbotg.h rename to arch/arm/src/kinetis/hardware/kinetis_usbotg.h index 490eae1ff73..10091175d80 100644 --- a/arch/arm/src/kinetis/chip/kinetis_usbotg.h +++ b/arch/arm/src/kinetis/hardware/kinetis_usbotg.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_usbotg.h + * arch/arm/src/kinetis/hardware/kinetis_usbotg.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBOTG_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBOTG_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBOTG_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBOTG_H /******************************************************************************************** * Included Files @@ -374,4 +374,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBOTG_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBOTG_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_vrefv1.h b/arch/arm/src/kinetis/hardware/kinetis_vrefv1.h similarity index 95% rename from arch/arm/src/kinetis/chip/kinetis_vrefv1.h rename to arch/arm/src/kinetis/hardware/kinetis_vrefv1.h index 29c871dd22d..cdc28b0fb95 100644 --- a/arch/arm/src/kinetis/chip/kinetis_vrefv1.h +++ b/arch/arm/src/kinetis/hardware/kinetis_vrefv1.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_vrefv1.h + * arch/arm/src/kinetis/hardware/kinetis_vrefv1.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_VREFV1_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_VREFV1_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_VREFV1_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_VREFV1_H /******************************************************************************************** * Included Files @@ -89,4 +89,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_VREFV1_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_VREFV1_H */ diff --git a/arch/arm/src/kinetis/chip/kinetis_wdog.h b/arch/arm/src/kinetis/hardware/kinetis_wdog.h similarity index 97% rename from arch/arm/src/kinetis/chip/kinetis_wdog.h rename to arch/arm/src/kinetis/hardware/kinetis_wdog.h index 6f503860499..64629d5e1b2 100644 --- a/arch/arm/src/kinetis/chip/kinetis_wdog.h +++ b/arch/arm/src/kinetis/hardware/kinetis_wdog.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/kinetis/chip/kinetis_wdog.h + * arch/arm/src/kinetis/hardware/kinetis_wdog.h * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_WDOG_H -#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_WDOG_H +#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_WDOG_H +#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_WDOG_H /******************************************************************************************** * Included Files @@ -134,4 +134,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_WDOG_H */ +#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_WDOG_H */ diff --git a/arch/arm/src/kinetis/kinetis.h b/arch/arm/src/kinetis/kinetis.h index 1cde44c4df0..0da3574d13f 100644 --- a/arch/arm/src/kinetis/kinetis.h +++ b/arch/arm/src/kinetis/kinetis.h @@ -53,7 +53,7 @@ #include "up_internal.h" #include "kinetis_config.h" #include "chip.h" -#include "chip/kinetis_port.h" +#include "hardware/kinetis_port.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c index 28218fcd86c..2da49e3246d 100644 --- a/arch/arm/src/kinetis/kinetis_clockconfig.c +++ b/arch/arm/src/kinetis/kinetis_clockconfig.c @@ -43,13 +43,13 @@ #include "up_arch.h" #include "kinetis.h" -#include "chip/kinetis_mcg.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_fmc.h" -#include "chip/kinetis_pmc.h" -#include "chip/kinetis_llwu.h" -#include "chip/kinetis_pinmux.h" -#include "chip/kinetis_osc.h" +#include "hardware/kinetis_mcg.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_fmc.h" +#include "hardware/kinetis_pmc.h" +#include "hardware/kinetis_llwu.h" +#include "hardware/kinetis_pinmux.h" +#include "hardware/kinetis_osc.h" #include diff --git a/arch/arm/src/kinetis/kinetis_dma.c b/arch/arm/src/kinetis/kinetis_dma.c index df7fc052cb3..254f2b727e7 100644 --- a/arch/arm/src/kinetis/kinetis_dma.c +++ b/arch/arm/src/kinetis/kinetis_dma.c @@ -58,8 +58,8 @@ #include "kinetis_config.h" #include "chip.h" #include "kinetis_dma.h" -#include "chip/kinetis_dmamux.h" -#include "chip/kinetis_sim.h" +#include "hardware/kinetis_dmamux.h" +#include "hardware/kinetis_sim.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/kinetis/kinetis_dma.h b/arch/arm/src/kinetis/kinetis_dma.h index 64ada268010..68aae63525c 100644 --- a/arch/arm/src/kinetis/kinetis_dma.h +++ b/arch/arm/src/kinetis/kinetis_dma.h @@ -45,7 +45,7 @@ #include #include -#include "chip/kinetis_dma.h" +#include "hardware/kinetis_dma.h" /**************************************************************************** * Pre-processor Declarations diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index e7265c6a95d..21c60249813 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -68,10 +68,10 @@ #include "chip.h" #include "kinetis.h" #include "kinetis_config.h" -#include "chip/kinetis_pinmux.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_mpu.h" -#include "chip/kinetis_enet.h" +#include "hardware/kinetis_pinmux.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_mpu.h" +#include "hardware/kinetis_enet.h" #if defined(KINETIS_NENET) && KINETIS_NENET > 0 diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c index 623921a0d45..e7524e9d371 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.c +++ b/arch/arm/src/kinetis/kinetis_i2c.c @@ -61,9 +61,9 @@ #include "kinetis_config.h" #include "chip.h" -#include "chip/kinetis_i2c.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_pinmux.h" +#include "hardware/kinetis_i2c.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_pinmux.h" #include "kinetis.h" #include "kinetis_i2c.h" diff --git a/arch/arm/src/kinetis/kinetis_i2c.h b/arch/arm/src/kinetis/kinetis_i2c.h index 8cb4246a17f..ff8b26db5ef 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.h +++ b/arch/arm/src/kinetis/kinetis_i2c.h @@ -42,7 +42,7 @@ #include #include -#include "chip/kinetis_i2c.h" +#include "hardware/kinetis_i2c.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c index a7667f3c9a2..8661f952a7e 100644 --- a/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/arch/arm/src/kinetis/kinetis_lowputc.c @@ -51,10 +51,10 @@ #include "kinetis_config.h" #include "kinetis.h" -#include "chip/kinetis_uart.h" -#include "chip/kinetis_lpuart.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_pinmux.h" +#include "hardware/kinetis_uart.h" +#include "hardware/kinetis_lpuart.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_pinmux.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c index 227acc06e01..177a4a7e6be 100644 --- a/arch/arm/src/kinetis/kinetis_lpserial.c +++ b/arch/arm/src/kinetis/kinetis_lpserial.c @@ -64,8 +64,8 @@ #include "up_internal.h" #include "kinetis.h" -#include "chip/kinetis_lpuart.h" -#include "chip/kinetis_pinmux.h" +#include "hardware/kinetis_lpuart.h" +#include "hardware/kinetis_pinmux.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/kinetis/kinetis_mpuinit.c b/arch/arm/src/kinetis/kinetis_mpuinit.c index 9618b5a071d..9817a4497f6 100644 --- a/arch/arm/src/kinetis/kinetis_mpuinit.c +++ b/arch/arm/src/kinetis/kinetis_mpuinit.c @@ -45,7 +45,7 @@ #include "mpu.h" #include "kinetis_mpuinit.h" -#include "chip/kinetis_mpu.h" +#include "hardware/kinetis_mpu.h" #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU) diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c index 4a084f6c275..9c76453dd4d 100644 --- a/arch/arm/src/kinetis/kinetis_pin.c +++ b/arch/arm/src/kinetis/kinetis_pin.c @@ -49,8 +49,8 @@ #include "up_internal.h" #include "kinetis.h" -#include "chip/kinetis_port.h" -#include "chip/kinetis_gpio.h" +#include "hardware/kinetis_port.h" +#include "hardware/kinetis_gpio.h" /**************************************************************************** * Public Functions diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c index a660c87307c..c59d328321a 100644 --- a/arch/arm/src/kinetis/kinetis_pindump.c +++ b/arch/arm/src/kinetis/kinetis_pindump.c @@ -46,8 +46,8 @@ #include "up_arch.h" #include "kinetis.h" -#include "chip/kinetis_gpio.h" -#include "chip/kinetis_port.h" +#include "hardware/kinetis_gpio.h" +#include "hardware/kinetis_port.h" #ifdef CONFIG_DEBUG_GPIO_INFO diff --git a/arch/arm/src/kinetis/kinetis_pingpio.c b/arch/arm/src/kinetis/kinetis_pingpio.c index b8879208164..1b7f6da5608 100644 --- a/arch/arm/src/kinetis/kinetis_pingpio.c +++ b/arch/arm/src/kinetis/kinetis_pingpio.c @@ -49,7 +49,7 @@ #include "up_internal.h" #include "kinetis.h" -#include "chip/kinetis_gpio.h" +#include "hardware/kinetis_gpio.h" /**************************************************************************** * Public Functions diff --git a/arch/arm/src/kinetis/kinetis_pinirq.c b/arch/arm/src/kinetis/kinetis_pinirq.c index 556bd518b56..f807a8be500 100644 --- a/arch/arm/src/kinetis/kinetis_pinirq.c +++ b/arch/arm/src/kinetis/kinetis_pinirq.c @@ -51,7 +51,7 @@ #include "up_internal.h" #include "kinetis.h" -#include "chip/kinetis_port.h" +#include "hardware/kinetis_port.h" #ifdef CONFIG_KINETIS_GPIOIRQ diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index b4dd646c9a6..1aada49b726 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -60,9 +60,9 @@ #include "kinetis.h" #include "kinetis_pwm.h" -#include "chip/kinetis_gpio.h" -#include "chip/kinetis_ftm.h" -#include "chip/kinetis_sim.h" +#include "hardware/kinetis_gpio.h" +#include "hardware/kinetis_ftm.h" +#include "hardware/kinetis_sim.h" /* This module then only compiles if there is at least one enabled timer * intended for use with the PWM upper half driver. diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h index 3caf77c6d2d..140fbf0f6e9 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.h +++ b/arch/arm/src/kinetis/kinetis_pwm.h @@ -77,7 +77,7 @@ defined(CONFIG_KINETIS_FTM2_PWM) || defined(CONFIG_KINETIS_FTM3_PWM) #include -#include "chip/kinetis_pinmux.h" +#include "hardware/kinetis_pinmux.h" /* For each timer that is enabled for PWM usage, we need the following additional * configuration settings: diff --git a/arch/arm/src/kinetis/kinetis_rtc.c b/arch/arm/src/kinetis/kinetis_rtc.c index d3e9a069f84..3617cd095f8 100644 --- a/arch/arm/src/kinetis/kinetis_rtc.c +++ b/arch/arm/src/kinetis/kinetis_rtc.c @@ -53,8 +53,8 @@ #include "kinetis_config.h" #include "chip.h" -#include "chip/kinetis_rtc.h" -#include "chip/kinetis_sim.h" +#include "hardware/kinetis_rtc.h" +#include "hardware/kinetis_sim.h" #include "kinetis.h" #include "kinetis_alarm.h" diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index 9f6fe29f39c..9820513274a 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -62,9 +62,9 @@ #include "up_arch.h" #include "kinetis.h" -#include "chip/kinetis_pinmux.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_sdhc.h" +#include "hardware/kinetis_pinmux.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_sdhc.h" #ifdef CONFIG_KINETIS_SDHC diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 58c4b575b93..e6c50b260e5 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -66,9 +66,9 @@ #include "kinetis_config.h" #include "chip.h" -#include "chip/kinetis_dmamux.h" -#include "chip/kinetis_uart.h" -#include "chip/kinetis_pinmux.h" +#include "hardware/kinetis_dmamux.h" +#include "hardware/kinetis_uart.h" +#include "hardware/kinetis_pinmux.h" #include "kinetis.h" #include "kinetis_dma.h" #include "kinetis_uart.h" diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c index ce3971518e8..7b8280c90d5 100644 --- a/arch/arm/src/kinetis/kinetis_spi.c +++ b/arch/arm/src/kinetis/kinetis_spi.c @@ -83,10 +83,10 @@ #include "kinetis.h" #include "kinetis_spi.h" -#include "chip/kinetis_memorymap.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_dspi.h" -#include "chip/kinetis_pinmux.h" +#include "hardware/kinetis_memorymap.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_dspi.h" +#include "hardware/kinetis_pinmux.h" #if defined(CONFIG_KINETIS_SPI0) || defined(CONFIG_KINETIS_SPI1) || \ defined(CONFIG_KINETIS_SPI2) diff --git a/arch/arm/src/kinetis/kinetis_spi.h b/arch/arm/src/kinetis/kinetis_spi.h index 4d3ce60ce24..b384311f7a8 100644 --- a/arch/arm/src/kinetis/kinetis_spi.h +++ b/arch/arm/src/kinetis/kinetis_spi.h @@ -42,7 +42,7 @@ #include -#include "chip/kinetis_dspi.h" +#include "hardware/kinetis_dspi.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c index 4ea5e6f0e84..937bf95b878 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -49,7 +49,7 @@ #include "up_internal.h" #include "kinetis.h" -#include "chip/kinetis_smc.h" +#include "hardware/kinetis_smc.h" #include "kinetis_mpuinit.h" #include "kinetis_userspace.h" diff --git a/arch/arm/src/kinetis/kinetis_tpm.h b/arch/arm/src/kinetis/kinetis_tpm.h index 03fe3b13627..5d256cd2d3e 100644 --- a/arch/arm/src/kinetis/kinetis_tpm.h +++ b/arch/arm/src/kinetis/kinetis_tpm.h @@ -50,7 +50,7 @@ */ #if defined(KINETIS_K66) -# include "chip/kinetis_kx6tpm.h" +# include "hardware/kinetis_kx6tpm.h" #else # error "No TMP definitions for this Kinetis part" #endif diff --git a/arch/arm/src/kinetis/kinetis_uid.c b/arch/arm/src/kinetis/kinetis_uid.c index 954c667f418..6667a792a93 100644 --- a/arch/arm/src/kinetis/kinetis_uid.c +++ b/arch/arm/src/kinetis/kinetis_uid.c @@ -38,8 +38,8 @@ #include -#include -#include +#include "hardware/kinetis_k64memorymap.h" +#include "hardware/kinetis_sim.h" #include "kinetis_uid.h" #ifdef CONFIG_BOARDCTL_UNIQUEID diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index 20ebd6d2301..c3a668592af 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -71,8 +71,8 @@ #include "up_arch.h" #include "kinetis.h" #include "kinetis_usbotg.h" -#include "chip/kinetis_sim.h" -#include "chip/kinetis_fmc.h" +#include "hardware/kinetis_sim.h" +#include "hardware/kinetis_fmc.h" #if defined(CONFIG_USBDEV) diff --git a/arch/arm/src/kinetis/kinetis_usbotg.h b/arch/arm/src/kinetis/kinetis_usbotg.h index 6353cf7f467..f31d3426af1 100644 --- a/arch/arm/src/kinetis/kinetis_usbotg.h +++ b/arch/arm/src/kinetis/kinetis_usbotg.h @@ -42,7 +42,7 @@ #include -#include "chip/kinetis_usbotg.h" +#include "hardware/kinetis_usbotg.h" /************************************************************************************ * Public Types diff --git a/arch/arm/src/kinetis/kinetis_wdog.c b/arch/arm/src/kinetis/kinetis_wdog.c index 3beaad8d4bc..463150bc139 100644 --- a/arch/arm/src/kinetis/kinetis_wdog.c +++ b/arch/arm/src/kinetis/kinetis_wdog.c @@ -43,7 +43,7 @@ #include "up_arch.h" #include "kinetis.h" -#include "chip/kinetis_wdog.h" +#include "hardware/kinetis_wdog.h" /**************************************************************************** * Private Functions diff --git a/configs/freedom-k28f/src/k28_usbdev.c b/configs/freedom-k28f/src/k28_usbdev.c index 3eec89b6994..0e95258b29c 100644 --- a/configs/freedom-k28f/src/k28_usbdev.c +++ b/configs/freedom-k28f/src/k28_usbdev.c @@ -50,7 +50,7 @@ #include "up_arch.h" #include "kinetis.h" #include "kinetis_usbotg.h" -#include "chip/kinetis_sim.h" +#include "hardware/kinetis_sim.h" #include "freedom-k28f.h" /************************************************************************************ diff --git a/configs/freedom-k64f/src/k64_uid.c b/configs/freedom-k64f/src/k64_uid.c index 0fc1527637c..5fe781c37b5 100644 --- a/configs/freedom-k64f/src/k64_uid.c +++ b/configs/freedom-k64f/src/k64_uid.c @@ -38,13 +38,14 @@ #include -#include -#include #include -#include "kinetis_uid.h" #include +#include "hardware/kinetis_k64memorymap.h" +#include "hardware/kinetis_sim.h" +#include "kinetis_uid.h" + #if defined(CONFIG_BOARDCTL_UNIQUEID) /**************************************************************************** diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c index f5f20fbf246..a8382c7f776 100644 --- a/configs/teensy-3.x/src/k20_usbdev.c +++ b/configs/teensy-3.x/src/k20_usbdev.c @@ -50,7 +50,7 @@ #include "up_arch.h" #include "kinetis.h" #include "kinetis_usbotg.h" -#include "chip/kinetis_sim.h" +#include "hardware/kinetis_sim.h" #include "teensy-3x.h" /************************************************************************************