sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2019-05-24 13:52:38 -06:00
parent 23f57b1d59
commit 8db1bae3a1
19 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/imx6/chip.h
View File

@ -46,7 +46,7 @@
# include <nuttx/arch.h>
#endif
#include "chip/imx_memorymap.h"
#include "hardware/imx_memorymap.h"
#include "imx_irq.h"
/****************************************************************************

10
arch/arm/src/imx6/chip/imx_ccm.h → arch/arm/src/imx6/hardware/imx_ccm.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/imx_ccm.h
* arch/arm/src/imx6/hardware/imx_ccm.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,15 +37,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_CCM_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_CCM_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_CCM_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_CCM_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/imx_memorymap.h>
#include "hardware/imx_memory.map"
/************************************************************************************
* Pre-processor Definitions
@ -1032,4 +1032,4 @@
#define CCM_CMEOR_MOD_EN_OV_CAN2_CPI (1 << 28) /* Bit 28: Overide clock enable signal from CAN2 */
#define CCM_CMEOR_MOD_EN_OV_CAN1_CPI (1 << 30) /* Bit 30: Overide clock enable signal from CAN1 */
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_CCM_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_CCM_H */

10
arch/arm/src/imx6/chip/imx_ecspi.h → arch/arm/src/imx6/hardware/imx_ecspi.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/imx_ecspi.h
* arch/arm/src/imx6/hardware/imx_ecspi.h
*
* Copyright (C) 2009-2010, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_IMX6_CHIP_ECSPI_H
#define __ARCH_ARM_IMX6_CHIP_ECSPI_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_ECSPI_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_ECSPI_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/imx_memorymap.h"
#include "hardware/imx_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -287,4 +287,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_IMX6_CHIP_ECSPI_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_ECSPI_H */

10
arch/arm/src/imx6/chip/imx_gpio.h → arch/arm/src/imx6/hardware/imx_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/imx_gpio.h
* arch/arm/src/imx6/hardware/imx_gpio.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,15 +37,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPIO_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPIO_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_GPIO_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_GPIO_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/imx_memorymap.h>
#include "hardware/imx_memory.map"
/************************************************************************************
* Pre-processor Definitions
@ -167,4 +167,4 @@
#define GPIO_ICR_MASK(n) (3 << GPIO_ICR_SHIFT(n))
#define GPIO_ICR(i,n) ((uint32_t)(i) << GPIO_ICR_SHIFT(n))
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPIO_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_GPIO_H */

10
arch/arm/src/imx6/chip/imx_gpt.h → arch/arm/src/imx6/hardware/imx_gpt.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/imx_gpt.h
* arch/arm/src/imx6/hardware/imx_gpt.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,15 +37,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPT_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPT_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_GPT_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_GPT_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/imx_memorymap.h>
#include "hardware/imx_memory.map"
/************************************************************************************
* Pre-processor Definitions
@ -154,4 +154,4 @@
/* GPT Input Capture Register 1,2 -- 32-bit capture registers */
/* GPT Counter Register -- 32-bit counter */
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPT_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_GPT_H */

10
arch/arm/src/imx6/chip/imx_iomuxc.h → arch/arm/src/imx6/hardware/imx_iomuxc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/chip/imx_iomuxc.h
* arch/arm/src/imx6/hardware/imx_iomuxc.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,15 +37,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_IOMUXC_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_IOMUXC_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_IOMUXC_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_IOMUXC_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/imx_memorymap.h>
#include "hardware/imx_memory.map"
/* These definitions derive from specifications for the i.MX 6Quad/6Dual and require
* review and modification in order to support other family members.
@ -2271,4 +2271,4 @@
/* Select Input Registers */
#endif /* CONFIG_ARCH_CHIP_IMX6_6QUAD || CONFIG_ARCH_CHIP_IMX6_6DUAL */
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_IOMUXC_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_IOMUXC_H */

8
arch/arm/src/imx6/chip/imx_memorymap.h → arch/arm/src/imx6/hardware/imx_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/chip/imx_memorymap.h
* arch/arm/src/imx6/hardware/imx_memorymap.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_MEMORYMAP_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_MEMORYMAP_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -1043,4 +1043,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_MEMORYMAP_H */

8
arch/arm/src/imx6/chip/imx_pinmux.h → arch/arm/src/imx6/hardware/imx_pinmux.h
View File

@ -1,5 +1,5 @@
/*****************************************************************************************************
* arch/arm/src/imx6/imx_pinmux.h
* arch/arm/src/imx6/hardware/imx_pinmux.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
*****************************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_PINMUX_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_PINMUX_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_PINMUX_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_PINMUX_H
/*****************************************************************************************************
* Pre-processor Definitions
@ -964,4 +964,4 @@
#define GPIO_XTALOSC_REF_CLK_24M_2 (GPIO_PERIPH | GPIO_ALT7 | GPIO_PADMUX(IMX_PADMUX_RGMII_TXC_INDEX))
#define GPIO_XTALOSC_REF_CLK_32K (GPIO_PERIPH | GPIO_ALT1 | GPIO_PADMUX(IMX_PADMUX_GPIO08_INDEX))
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_PINMUX_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_PINMUX_H */

10
arch/arm/src/imx6/chip/imx_src.h → arch/arm/src/imx6/hardware/imx_src.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************************
* arch/arm/src/imx6/imx_src.h
* arch/arm/src/imx6/hardware/imx_src.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,15 +37,15 @@
*
****************************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_SRC_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_SRC_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_SRC_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_SRC_H
/****************************************************************************************************
* Included Files
****************************************************************************************************/
#include <nuttx/config.h>
#include <chip/imx_memorymap.h>
#include "hardware/imx_memory.map"
/****************************************************************************************************
* Pre-processor Definitions
@ -209,4 +209,4 @@
#define SRC_GPR10_RW2_MASK (15 << SRC_GPR10_RW2_SHIFT)
# define SRC_GPR10_RW2(n) ((uint32_t)(n) << SRC_GPR10_RW2_SHIFT)
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_SRC_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_SRC_H */

10
arch/arm/src/imx6/chip/imx_uart.h → arch/arm/src/imx6/hardware/imx_uart.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/imx6/imx_uart.h
* arch/arm/src/imx6/hardware/imx_uart.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,15 +37,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_IMX6_CHIP_IMX_UART_H
#define __ARCH_ARM_SRC_IMX6_CHIP_IMX_UART_H
#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_UART_H
#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_UART_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <chip/imx_memorymap.h>
#include "hardware/imx_memory.map"
/************************************************************************************
* Pre-processor Definitions
@ -364,4 +364,4 @@
#define UART_UMCR_SLADDR_MASK (0xff << UART_UMCR_SLADDR_SHIFT)
# define UART_UMCR_SLADDR(n) ((uint32_t)(n) << UART_UMCR_SLADDR_SHIFT)
#endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_UART_H */
#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_UART_H */

2
arch/arm/src/imx6/imx_clockconfig.c
View File

@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include "up_arch.h"
#include "chip/imx_ccm.h"
#include "hardware/imx_ccm.h"
#include "imx_config.h"
#include "imx_clockconfig.h"

2
arch/arm/src/imx6/imx_cpuboot.c
View File

@ -48,7 +48,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip/imx_src.h"
#include "hardware/imx_src.h"
#include "sctlr.h"
#include "smp.h"
#include "scu.h"

2
arch/arm/src/imx6/imx_ecspi.h
View File

@ -46,7 +46,7 @@
#include <stdbool.h>
#include <nuttx/spi/spi.h>
#include "chip/imx_ecspi.h"
#include "hardware/imx_ecspi.h"
/************************************************************************************
* Pre-processor Definitions

2
arch/arm/src/imx6/imx_gpio.h
View File

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

2
arch/arm/src/imx6/imx_iomuxc.h
View File

@ -44,7 +44,7 @@
#include <stdint.h>
#include "chip/imx_iomuxc.h"
#include "hardware/imx_iomuxc.h"
/****************************************************************************
* Pre-processor Definitions

8
arch/arm/src/imx6/imx_lowputc.c
View File

@ -45,9 +45,9 @@
#include "up_arch.h"
#include "chip/imx_iomuxc.h"
#include "chip/imx_ccm.h"
#include "chip/imx_uart.h"
#include "hardware/imx_iomuxc.h"
#include "hardware/imx_ccm.h"
#include "hardware/imx_uart.h"
#include "imx_config.h"
#include "imx_iomuxc.h"
#include "imx_gpio.h"
@ -55,7 +55,7 @@
#include "up_internal.h"
#include "chip/imx_pinmux.h"
#include "hardware/imx_pinmux.h"
#include <arch/board/board.h> /* Include last: has dependencies */
/****************************************************************************

2
arch/arm/src/imx6/imx_memorymap.c
View File

@ -41,7 +41,7 @@
#include "mmu.h"
#include "chip/imx_memorymap.h"
#include "hardware/imx_memorymap.h"
#include "imx_memorymap.h"
/****************************************************************************

2
arch/arm/src/imx6/imx_serial.c
View File

@ -59,7 +59,7 @@
#include "up_internal.h"
#include "gic.h"
#include "chip/imx_uart.h"
#include "hardware/imx_uart.h"
#include "imx_config.h"
#include "imx_lowputc.h"

4
arch/arm/src/imx6/imx_timerisr.c
View File

@ -47,8 +47,8 @@
#include "up_arch.h"
#include "gic.h"
#include "chip/imx_ccm.h"
#include "chip/imx_gpt.h"
#include "hardware/imx_ccm.h"
#include "hardware/imx_gpt.h"
/****************************************************************************
* Pre-processor Definitions