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

arch/arm/src/tiva: Use naming sysctrl vs syscontrol be better match TI documentation. Combine hardware/cc13x2_cc26x2_v* directories.

Browse Source
This commit is contained in:
Gregory Nutt 2018-12-04 07:32:53 -06:00
parent 1afe4676e2
commit 7d8f6625e3
22 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/tiva/Make.defs
View File

@ -91,9 +91,9 @@ CHIP_CSRCS += tiva_dumpgpio.c
endif
ifeq ($(CONFIG_ARCH_CHIP_TM4C129),y)
CHIP_CSRCS += tm4c129_syscontrol.c
CHIP_CSRCS += tm4c129_sysctrl.c
else
CHIP_CSRCS += tiva_syscontrol.c
CHIP_CSRCS += tiva_sysctrl.c
endif
ifneq ($(CONFIG_SCHED_TICKLESS),y)

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

@ -47,7 +47,7 @@
/* Then get all of the register definitions */
#include "hardware/tiva_memorymap.h" /* Memory map */
#include "hardware/tiva_syscontrol.h" /* System control module */
#include "hardware/tiva_sysctrl.h" /* System control module */
#include "hardware/tiva_gpio.h" /* GPIO modules */
#include "hardware/tiva_uart.h" /* UART modules */
#include "hardware/tiva_i2c.h" /* I2C modules */

2
arch/arm/src/tiva/common/tiva_adclow.c
View File

@ -83,7 +83,7 @@
#include "tiva_adc.h"
#include "hardware/tiva_adc.h"
#include "hardware/tiva_pinmap.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
#ifdef CONFIG_TIVA_ADC

2
arch/arm/src/tiva/common/tiva_eeprom.c
View File

@ -48,7 +48,7 @@
#include "up_arch.h"
#include "chip.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
#include "tiva_eeprom.h"
/****************************************************************************

2
arch/arm/src/tiva/common/tiva_i2c.c
View File

@ -69,7 +69,7 @@
#include "tiva_enableclks.h"
#include "tiva_gpio.h"
#include "hardware/tiva_pinmap.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
#include "tiva_i2c.h"
/* At least one I2C peripheral must be enabled */

2
arch/arm/src/tiva/common/tiva_start.c
View File

@ -54,7 +54,7 @@
#include "up_internal.h"
#include "tiva_lowputc.h"
#include "tiva_syscontrol.h"
#include "tiva_sysctrl.h"
#include "tiva_userspace.h"
#include "tiva_eeprom.h"
#include "tiva_start.h"

4
arch/arm/src/tiva/common/tiva_syscontrol.c → arch/arm/src/tiva/common/tiva_sysctrl.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/tiva/common/tiva_syscontrol.c
* arch/arm/src/tiva/common/tiva_sysctrl.c
*
* Copyright (C) 2009-2014, 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +49,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip.h"
#include "tiva_syscontrol.h"
#include "tiva_sysctrl.h"
/****************************************************************************
* Pre-processor Definitions

2
arch/arm/src/tiva/common/tiva_timerlib.c
View File

@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
#include "hardware/tiva_timer.h"
#include "tiva_enableclks.h"

8
arch/arm/src/tiva/hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h → arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h
View File

@ -1,5 +1,5 @@
/******************************************************************************
* arch/arm/src/tiva/hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h
* arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,8 +41,8 @@
*
******************************************************************************/
#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V1_CC13X2_CC26X2_V1_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V1_CC13X2_CC26X2_V1_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V1_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V1_MEMORYMAP_H
/******************************************************************************
* Pre-processor Definitions
@ -183,4 +183,4 @@
#define CPU_TIPROP_BASE 0xe00fe000 /* CPU_TIPROP */
#define CPU_ROM_TABLE_BASE 0xe00ff000 /* CPU_ROM_TABLE */
#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V1_CC13X2_CC26X2_V1_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V1_MEMORYMAP_H */

8
arch/arm/src/tiva/hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h → arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h
View File

@ -1,5 +1,5 @@
/******************************************************************************
* arch/arm/src/tiva/hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h
* arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,8 +41,8 @@
*
******************************************************************************/
#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V2_CC13X2_CC26X2_V2_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V2_CC13X2_CC26X2_V2_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V2_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V2_MEMORYMAP_H
/******************************************************************************
* Pre-processor Definitions
@ -183,4 +183,4 @@
#define CPU_TIPROP_BASE 0xe00fe000 /* CPU_TIPROP */
#define CPU_ROM_TABLE_BASE 0xe00ff000 /* CPU_ROM_TABLE */
#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V2_CC13X2_CC26X2_V2_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V2_MEMORYMAP_H */

2
arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h → arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/tiva/hardmware/lm/3s_syscontrol.h
* arch/arm/src/tiva/hardmware/lm/3s_sysctrl.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h → arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/tiva/hardmware/lm/4f_syscontrol.h
* arch/arm/src/tiva/hardmware/lm/4f_sysctrl.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

4
arch/arm/src/tiva/hardware/tiva_memorymap.h
View File

@ -53,9 +53,9 @@
#elif defined(CONFIG_ARCH_CHIP_CC13X0)
# include "hardware/cc13x0/cc13x0_memorymap.h"
#elif defined(CONFIG_ARCH_CHIP_CC13X2_V1)
# include "hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h"
# include "hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h"
#elif defined(CONFIG_ARCH_CHIP_CC13X2_V2)
# include "hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h"
# include "hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h"
#else
# error "Unsupported Tiva/Stellaris memory map"
#endif

10
arch/arm/src/tiva/hardware/tiva_syscontrol.h → arch/arm/src/tiva/hardware/tiva_sysctrl.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/tiva/hardwaretiva_syscontrol.h
* arch/arm/src/tiva/hardwaretiva_sysctrl.h
*
* Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -46,13 +46,13 @@
/* Include the system control header file for the specific Tiva/Stellaris chip */
#if defined(CONFIG_ARCH_CHIP_LM3S)
# include "hardware/lm/lm3s_syscontrol.h"
# include "hardware/lm/lm3s_sysctrl.h"
#elif defined(CONFIG_ARCH_CHIP_LM4F)
# include "hardware/lm/lm4f_syscontrol.h"
# include "hardware/lm/lm4f_sysctrl.h"
#elif defined(CONFIG_ARCH_CHIP_TM4C123)
# include "hardware/tm4c/tm4c123_syscontrol.h"
# include "hardware/tm4c/tm4c123_sysctrl.h"
#elif defined(CONFIG_ARCH_CHIP_TM4C129)
# include "hardware/tm4c/tm4c129_syscontrol.h"
# include "hardware/tm4c/tm4c129_sysctrl.h"
#else
# error "Unsupported Tiva/Stellaris system control module"
#endif

2
arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h → arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h
* arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h → arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h
* arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/tiva/tiva_enableclks.h
View File

@ -44,7 +44,7 @@
#include "up_arch.h"
#include "chip.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
/************************************************************************************
* Pre-processor Definitions

2
arch/arm/src/tiva/tiva_enablepwr.h
View File

@ -44,7 +44,7 @@
#include "up_arch.h"
#include "chip.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
/************************************************************************************
* Pre-processor Definitions

2
arch/arm/src/tiva/tiva_periphrdy.h
View File

@ -44,7 +44,7 @@
#include "up_arch.h"
#include "chip.h"
#include "hardware/tiva_syscontrol.h"
#include "hardware/tiva_sysctrl.h"
/************************************************************************************
* Pre-processor Definitions

2
arch/arm/src/tiva/tiva_syscontrol.h → arch/arm/src/tiva/tiva_sysctrl.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/tiva/tiva_syscontrol.h
* arch/arm/src/tiva/tiva_sysctrl.h
*
* Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

4
arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c → arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c
* arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +49,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip.h"
#include "tiva_syscontrol.h"
#include "tiva_sysctrl.h"
/****************************************************************************
* Pre-processor Definitions

2
arch/arm/src/tiva/tm4c/tm4c_ethernet.c
View File

@ -70,7 +70,7 @@
#include "chip.h"
#include "tiva_gpio.h"
#include "tiva_syscontrol.h"
#include "tiva_sysctrl.h"
#include "tiva_enablepwr.h"
#include "tiva_enableclks.h"
#include "tiva_periphrdy.h"