From 9ad4dbcc95d47de7496a4f9e28d29451531401d2 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 24 May 2019 14:53:32 -0600 Subject: [PATCH] Rename arch/arm/src/tmc570/chip to arch/arm/src/tmc570/hardware. --- arch/arm/src/tms570/chip.h | 2 +- .../arm/src/tms570/{chip => hardware}/tms570_esm.h | 10 +++++----- .../src/tms570/{chip => hardware}/tms570_flash.h | 10 +++++----- .../arm/src/tms570/{chip => hardware}/tms570_gio.h | 10 +++++----- .../src/tms570/{chip => hardware}/tms570_iomm.h | 10 +++++----- .../tms570/{chip => hardware}/tms570_memorymap.h | 14 +++++++------- .../src/tms570/{chip => hardware}/tms570_pbist.h | 10 +++++----- .../arm/src/tms570/{chip => hardware}/tms570_pcr.h | 10 +++++----- .../src/tms570/{chip => hardware}/tms570_pinmux.h | 14 +++++++------- .../arm/src/tms570/{chip => hardware}/tms570_rti.h | 10 +++++----- .../arm/src/tms570/{chip => hardware}/tms570_sci.h | 10 +++++----- .../arm/src/tms570/{chip => hardware}/tms570_sys.h | 10 +++++----- .../src/tms570/{chip => hardware}/tms570_sys2.h | 10 +++++----- .../arm/src/tms570/{chip => hardware}/tms570_vim.h | 10 +++++----- .../{chip => hardware}/tms570ls04x03x_memorymap.h | 8 ++++---- .../{chip => hardware}/tms570ls04x03x_pinmux.h | 10 +++++----- arch/arm/src/tms570/tms570_boot.c | 6 +++--- arch/arm/src/tms570/tms570_clockconfig.c | 14 +++++++------- arch/arm/src/tms570/tms570_esm.c | 2 +- arch/arm/src/tms570/tms570_gio.c | 2 +- arch/arm/src/tms570/tms570_gio.h | 2 +- arch/arm/src/tms570/tms570_gioirq.c | 2 +- arch/arm/src/tms570/tms570_irq.c | 2 +- arch/arm/src/tms570/tms570_lowputc.c | 4 ++-- arch/arm/src/tms570/tms570_selftest.c | 4 ++-- arch/arm/src/tms570/tms570_serial.c | 2 +- arch/arm/src/tms570/tms570_timerisr.c | 2 +- 27 files changed, 100 insertions(+), 100 deletions(-) rename arch/arm/src/tms570/{chip => hardware}/tms570_esm.h (97%) rename arch/arm/src/tms570/{chip => hardware}/tms570_flash.h (98%) rename arch/arm/src/tms570/{chip => hardware}/tms570_gio.h (99%) rename arch/arm/src/tms570/{chip => hardware}/tms570_iomm.h (97%) rename arch/arm/src/tms570/{chip => hardware}/tms570_memorymap.h (87%) rename arch/arm/src/tms570/{chip => hardware}/tms570_pbist.h (98%) rename arch/arm/src/tms570/{chip => hardware}/tms570_pcr.h (99%) rename arch/arm/src/tms570/{chip => hardware}/tms570_pinmux.h (90%) rename arch/arm/src/tms570/{chip => hardware}/tms570_rti.h (98%) rename arch/arm/src/tms570/{chip => hardware}/tms570_sci.h (98%) rename arch/arm/src/tms570/{chip => hardware}/tms570_sys.h (99%) rename arch/arm/src/tms570/{chip => hardware}/tms570_sys2.h (97%) rename arch/arm/src/tms570/{chip => hardware}/tms570_vim.h (97%) rename arch/arm/src/tms570/{chip => hardware}/tms570ls04x03x_memorymap.h (96%) rename arch/arm/src/tms570/{chip => hardware}/tms570ls04x03x_pinmux.h (97%) diff --git a/arch/arm/src/tms570/chip.h b/arch/arm/src/tms570/chip.h index 9985e49363f..76e3a8cc383 100644 --- a/arch/arm/src/tms570/chip.h +++ b/arch/arm/src/tms570/chip.h @@ -43,7 +43,7 @@ #include #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/tms570/chip/tms570_esm.h b/arch/arm/src/tms570/hardware/tms570_esm.h similarity index 97% rename from arch/arm/src/tms570/chip/tms570_esm.h rename to arch/arm/src/tms570/hardware/tms570_esm.h index cd1ac9877c6..04289492f2d 100644 --- a/arch/arm/src/tms570/chip/tms570_esm.h +++ b/arch/arm/src/tms570/hardware/tms570_esm.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_esm.h + * arch/arm/src/tms570/hardware/tms570_esm.h * Error Signalling Module Error Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_ESM_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_ESM_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_ESM_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_ESM_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -208,4 +208,4 @@ #define ESM_ILCR4_CHAN(n) (1 << (n)) /* Bit n: Maps channel n low level interrupt */ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_ESM_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_ESM_H */ diff --git a/arch/arm/src/tms570/chip/tms570_flash.h b/arch/arm/src/tms570/hardware/tms570_flash.h similarity index 98% rename from arch/arm/src/tms570/chip/tms570_flash.h rename to arch/arm/src/tms570/hardware/tms570_flash.h index d1b14666760..80b1af6ec89 100644 --- a/arch/arm/src/tms570/chip/tms570_flash.h +++ b/arch/arm/src/tms570/hardware/tms570_flash.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_flash.h + * arch/arm/src/tms570/hardware/tms570_flash.h * FLASH Module Controller Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_FLASH_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_FLASH_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_FLASH_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_FLASH_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -268,4 +268,4 @@ /* Flash Bank Configuration Register */ #define FLASH_FCFGBANK_ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_FLASH_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_FLASH_H */ diff --git a/arch/arm/src/tms570/chip/tms570_gio.h b/arch/arm/src/tms570/hardware/tms570_gio.h similarity index 99% rename from arch/arm/src/tms570/chip/tms570_gio.h rename to arch/arm/src/tms570/hardware/tms570_gio.h index 1599e58ff5a..1e5c5929b2f 100644 --- a/arch/arm/src/tms570/chip/tms570_gio.h +++ b/arch/arm/src/tms570/hardware/tms570_gio.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_gio.h + * arch/arm/src/tms570/hardware/tms570_gio.h * Secondary System Control Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_GIO_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_GIO_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_GIO_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_GIO_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -442,4 +442,4 @@ #define GIO_PIN(n) (1 << (n)) /* Bit n: Corresponds to pin n */ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_GIO_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_GIO_H */ diff --git a/arch/arm/src/tms570/chip/tms570_iomm.h b/arch/arm/src/tms570/hardware/tms570_iomm.h similarity index 97% rename from arch/arm/src/tms570/chip/tms570_iomm.h rename to arch/arm/src/tms570/hardware/tms570_iomm.h index bafd17420a1..ead7d1c5f8e 100644 --- a/arch/arm/src/tms570/chip/tms570_iomm.h +++ b/arch/arm/src/tms570/hardware/tms570_iomm.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_iomm.h + * arch/arm/src/tms570/hardware/tms570_iomm.h * I/O Muliplexing and Control Module (IOMM) Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_IOMM_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_IOMM_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_IOMM_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_IOMM_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -188,4 +188,4 @@ #define IOMM_PINMMR_PINMASK(n) (0xff << IOMM_PINMMR_PINSHIFT(n)) # define IOMM_PINMMR_PINVALUE(n,v) ((uint32_t)(v) << IOMM_PINMMR_PINSHIFT(n)) -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_IOMM_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_IOMM_H */ diff --git a/arch/arm/src/tms570/chip/tms570_memorymap.h b/arch/arm/src/tms570/hardware/tms570_memorymap.h similarity index 87% rename from arch/arm/src/tms570/chip/tms570_memorymap.h rename to arch/arm/src/tms570/hardware/tms570_memorymap.h index fafb946b79d..06d91e79c66 100644 --- a/arch/arm/src/tms570/chip/tms570_memorymap.h +++ b/arch/arm/src/tms570/hardware/tms570_memorymap.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_memorymap.h + * arch/arm/src/tms570/hardware/tms570_memorymap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_MEMORYMAP_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_MEMORYMAP_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_MEMORYMAP_H /**************************************************************************************************** * Included Files @@ -45,9 +45,9 @@ #if defined(CONFIG_ARCH_CHIP_TMS570LS0232PZ) # error No memory map for the TMS570LS0232PZ #elif defined(CONFIG_ARCH_CHIP_TMS570LS0332PZ) -# include "chip/tms570ls04x03x_memorymap.h" +# include "hardware/tms570ls04x03x_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_TMS570LS0432PZ) -# include "chip/tms570ls04x03x_memorymap.h" +# include "hardware/tms570ls04x03x_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_TMS570LS0714PZ) # error No memory map for the TMS570LS0714PZ #elif defined(CONFIG_ARCH_CHIP_TMS570LS0714PGE) @@ -57,9 +57,9 @@ #elif defined(CONFIG_ARCH_CHIP_TMS570LS1227ZWT) # error No memory map for the TMS570LS1227ZWT #elif defined(CONFIG_ARCH_CHIP_TMS570LS3137ZWT) -# include "chip/tms570ls31xx_memorymap.h" +# include "hardware/tms570ls31xx_memorymap.h" #else # error "Unrecognized Hercules chip" #endif -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_MEMORYMAP_H */ diff --git a/arch/arm/src/tms570/chip/tms570_pbist.h b/arch/arm/src/tms570/hardware/tms570_pbist.h similarity index 98% rename from arch/arm/src/tms570/chip/tms570_pbist.h rename to arch/arm/src/tms570/hardware/tms570_pbist.h index 2e4cfb5d725..b3f21fd7842 100644 --- a/arch/arm/src/tms570/chip/tms570_pbist.h +++ b/arch/arm/src/tms570/hardware/tms570_pbist.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_pbist.h + * arch/arm/src/tms570/hardware/tms570_pbist.h * Secondary System Control Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PBIST_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PBIST_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PBIST_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PBIST_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -245,4 +245,4 @@ /* RAM Info Mask Upper Register */ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PBIST_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PBIST_H */ diff --git a/arch/arm/src/tms570/chip/tms570_pcr.h b/arch/arm/src/tms570/hardware/tms570_pcr.h similarity index 99% rename from arch/arm/src/tms570/chip/tms570_pcr.h rename to arch/arm/src/tms570/hardware/tms570_pcr.h index c928da5e6ce..b75c4c00b64 100644 --- a/arch/arm/src/tms570/chip/tms570_pcr.h +++ b/arch/arm/src/tms570/hardware/tms570_pcr.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_pcr.h + * arch/arm/src/tms570/hardware/tms570_pcr.h * Peripheral Control Register (PCR) Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PCR_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PCR_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PCR_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PCR_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -393,4 +393,4 @@ # define PCR_PSPWERDWN3_PS31_Q4 (8 << PCR_PSPWERDWN3_PS31_SHIFT) # define PCR_PSPWERDWN3_PS31_QALL (15 << PCR_PSPWERDWN3_PS31_SHIFT) -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PCR_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PCR_H */ diff --git a/arch/arm/src/tms570/chip/tms570_pinmux.h b/arch/arm/src/tms570/hardware/tms570_pinmux.h similarity index 90% rename from arch/arm/src/tms570/chip/tms570_pinmux.h rename to arch/arm/src/tms570/hardware/tms570_pinmux.h index af97106b7c1..db708c02a79 100644 --- a/arch/arm/src/tms570/chip/tms570_pinmux.h +++ b/arch/arm/src/tms570/hardware/tms570_pinmux.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_pinmux.h + * arch/arm/src/tms570/hardware/tms570_pinmux.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PINMUX_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PINMUX_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PINMUX_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PINMUX_H /**************************************************************************************************** * Included Files @@ -45,9 +45,9 @@ #if defined(CONFIG_ARCH_CHIP_TMS570LS0232PZ) # error No pin multiplexing for the TMS570LS0232PZ #elif defined(CONFIG_ARCH_CHIP_TMS570LS0332PZ) -# include "chip/tms570ls04x03x_pinmux.h" +# include "hardware/tms570ls04x03x_pinmux.h" #elif defined(CONFIG_ARCH_CHIP_TMS570LS0432PZ) -# include "chip/tms570ls04x03x_pinmux.h" +# include "hardware/tms570ls04x03x_pinmux.h" #elif defined(CONFIG_ARCH_CHIP_TMS570LS0714PZ) # error No pin multiplexing for the TMS570LS0714PZ #elif defined(CONFIG_ARCH_CHIP_TMS570LS0714PGE) @@ -57,7 +57,7 @@ #elif defined(CONFIG_ARCH_CHIP_TMS570LS1227ZWT) # error No pin multiplexing for the TMS570LS1227ZWT #elif defined(CONFIG_ARCH_CHIP_TMS570LS3137ZWT) -# include "chip/tms570ls04x03x_pinmux.h" +# include "hardware/tms570ls04x03x_pinmux.h" #else # error "Unrecognized Hercules chip" #endif @@ -75,4 +75,4 @@ struct tms570_pinmux_s uint8_t value; /* The new value for the pin field in the PINMMR register */ }; -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_PINMUX_H */ diff --git a/arch/arm/src/tms570/chip/tms570_rti.h b/arch/arm/src/tms570/hardware/tms570_rti.h similarity index 98% rename from arch/arm/src/tms570/chip/tms570_rti.h rename to arch/arm/src/tms570/hardware/tms570_rti.h index 69fc30739d3..8c6bd5e8092 100644 --- a/arch/arm/src/tms570/chip/tms570_rti.h +++ b/arch/arm/src/tms570/hardware/tms570_rti.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_rti.h + * arch/arm/src/tms570/hardware/tms570_rti.h * Real Time Interrupt (RTI) Module Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_RTI_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_RTI_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_RTI_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_RTI_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -200,4 +200,4 @@ /* RTI Compare 3 Clear Register */ #define RTI_COMP3CLR_ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_RTI_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_RTI_H */ diff --git a/arch/arm/src/tms570/chip/tms570_sci.h b/arch/arm/src/tms570/hardware/tms570_sci.h similarity index 98% rename from arch/arm/src/tms570/chip/tms570_sci.h rename to arch/arm/src/tms570/hardware/tms570_sci.h index 71c4857c68b..81e85eabe1b 100644 --- a/arch/arm/src/tms570/chip/tms570_sci.h +++ b/arch/arm/src/tms570/hardware/tms570_sci.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_sci.h + * arch/arm/src/tms570/hardware/tms570_sci.h * Secondary System Control Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SCI_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SCI_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SCI_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SCI_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -362,4 +362,4 @@ /* Input/Output Error Enable Register */ #define SCI_IODFTCTRL_ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SCI_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SCI_H */ diff --git a/arch/arm/src/tms570/chip/tms570_sys.h b/arch/arm/src/tms570/hardware/tms570_sys.h similarity index 99% rename from arch/arm/src/tms570/chip/tms570_sys.h rename to arch/arm/src/tms570/hardware/tms570_sys.h index 8357d8923eb..e1ce9289651 100644 --- a/arch/arm/src/tms570/chip/tms570_sys.h +++ b/arch/arm/src/tms570/hardware/tms570_sys.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_sys.h + * arch/arm/src/tms570/hardware/tms570_sys.h * Primary System Control Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SYS_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SYS_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SYS_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SYS_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -658,4 +658,4 @@ /* System Software Interrupt Flag Register */ #define SYS_SSIF_ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SYS_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SYS_H */ diff --git a/arch/arm/src/tms570/chip/tms570_sys2.h b/arch/arm/src/tms570/hardware/tms570_sys2.h similarity index 97% rename from arch/arm/src/tms570/chip/tms570_sys2.h rename to arch/arm/src/tms570/hardware/tms570_sys2.h index 9772b8dd235..23570a018ed 100644 --- a/arch/arm/src/tms570/chip/tms570_sys2.h +++ b/arch/arm/src/tms570/hardware/tms570_sys2.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_sys2.h + * arch/arm/src/tms570/hardware/tms570_sys2.h * Secondary System Control Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SYS2_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SYS2_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SYS2_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SYS2_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -156,4 +156,4 @@ #endif -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_SYS2_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_SYS2_H */ diff --git a/arch/arm/src/tms570/chip/tms570_vim.h b/arch/arm/src/tms570/hardware/tms570_vim.h similarity index 97% rename from arch/arm/src/tms570/chip/tms570_vim.h rename to arch/arm/src/tms570/hardware/tms570_vim.h index 9b30c33374c..8da356a21c2 100644 --- a/arch/arm/src/tms570/chip/tms570_vim.h +++ b/arch/arm/src/tms570/hardware/tms570_vim.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570_vim.h + * arch/arm/src/tms570/hardware/tms570_vim.h * Vector Intererrupt Manager (VIM) Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570_VIM_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570_VIM_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_VIM_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_VIM_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -215,4 +215,4 @@ #define VIM_CHANCTRL_MASK(n) (0xff << VIM_CHANCTRL_SHIFT(n)) # define VIM_CHANCTRL(n,v) ((uint32_t)(v) << VIM_CHANCTRL_SHIFT(n)) -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570_VIM_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570_VIM_H */ diff --git a/arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h b/arch/arm/src/tms570/hardware/tms570ls04x03x_memorymap.h similarity index 96% rename from arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h rename to arch/arm/src/tms570/hardware/tms570ls04x03x_memorymap.h index df12323497d..22378571ce2 100644 --- a/arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h +++ b/arch/arm/src/tms570/hardware/tms570ls04x03x_memorymap.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h + * arch/arm/src/tms570/hardware/tms570ls04x03x_memorymap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_MEMORYMAP_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570LS04X03X_MEMORYMAP_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570LS04X03X_MEMORYMAP_H /**************************************************************************************************** * Included Files @@ -128,4 +128,4 @@ #define TMS570_VIM_BASE 0xfffffe00 /* 0xfffffe00-0xfffffeff: VIM */ #define TMS570_SYS_BASE 0xffffff00 /* 0xffffff00-0xffffffff: System Module - Frame 1 */ -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570LS04X03X_MEMORYMAP_H */ diff --git a/arch/arm/src/tms570/chip/tms570ls04x03x_pinmux.h b/arch/arm/src/tms570/hardware/tms570ls04x03x_pinmux.h similarity index 97% rename from arch/arm/src/tms570/chip/tms570ls04x03x_pinmux.h rename to arch/arm/src/tms570/hardware/tms570ls04x03x_pinmux.h index 113d9dfc757..d46633bfcb5 100644 --- a/arch/arm/src/tms570/chip/tms570ls04x03x_pinmux.h +++ b/arch/arm/src/tms570/hardware/tms570ls04x03x_pinmux.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/tms570/chip/tms570ls04x03x_pinmux.h + * arch/arm/src/tms570/hardware/tms570ls04x03x_pinmux.h * Secondary System Control Register Definitions * * Copyright (C) 2015 Gregory Nutt. All rights reserved. @@ -39,15 +39,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_PINMUX_H -#define __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_PINMUX_H +#ifndef __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570LS04X03X_PINMUX_H +#define __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570LS04X03X_PINMUX_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/tms570_memorymap.h" +#include "hardware/tms570_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -254,4 +254,4 @@ #define PINMUX_N2HET17_VALUE 4 #define PINMUX_N2HET17_PIN {PINMUX_N2HET17_PINMMR, PINMUX_N2HET17_SHIFT, PINMUX_N2HET17_VALUE} -#endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_TMS570_HARDWARE_TMS570LS04X03X_PINMUX_H */ diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c index 94e9cd9745d..ba8b552cab8 100644 --- a/arch/arm/src/tms570/tms570_boot.c +++ b/arch/arm/src/tms570/tms570_boot.c @@ -61,9 +61,9 @@ #include -#include "chip/tms570_sys.h" -#include "chip/tms570_esm.h" -#include "chip/tms570_pbist.h" +#include "hardware/tms570_sys.h" +#include "hardware/tms570_esm.h" +#include "hardware/tms570_pbist.h" #include "tms570_clockconfig.h" #include "tms570_selftest.h" #include "tms570_gio.h" diff --git a/arch/arm/src/tms570/tms570_clockconfig.c b/arch/arm/src/tms570/tms570_clockconfig.c index a1f6815d0ed..1dd057fab36 100644 --- a/arch/arm/src/tms570/tms570_clockconfig.c +++ b/arch/arm/src/tms570/tms570_clockconfig.c @@ -50,13 +50,13 @@ #include "up_arch.h" -#include "chip/tms570_esm.h" -#include "chip/tms570_sys.h" -#include "chip/tms570_sys2.h" -#include "chip/tms570_pcr.h" -#include "chip/tms570_flash.h" -#include "chip/tms570_iomm.h" -#include "chip/tms570_pinmux.h" +#include "hardware/tms570_esm.h" +#include "hardware/tms570_sys.h" +#include "hardware/tms570_sys2.h" +#include "hardware/tms570_pcr.h" +#include "hardware/tms570_flash.h" +#include "hardware/tms570_iomm.h" +#include "hardware/tms570_pinmux.h" #include "tms570_selftest.h" #include "tms570_clockconfig.h" diff --git a/arch/arm/src/tms570/tms570_esm.c b/arch/arm/src/tms570/tms570_esm.c index f267f1a8fde..da72b0d3601 100644 --- a/arch/arm/src/tms570/tms570_esm.c +++ b/arch/arm/src/tms570/tms570_esm.c @@ -55,7 +55,7 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/tms570_esm.h" +#include "hardware/tms570_esm.h" #include "tms570_esm.h" /**************************************************************************** diff --git a/arch/arm/src/tms570/tms570_gio.c b/arch/arm/src/tms570/tms570_gio.c index 34ffb4cfd21..089fd67bfb4 100644 --- a/arch/arm/src/tms570/tms570_gio.c +++ b/arch/arm/src/tms570/tms570_gio.c @@ -51,7 +51,7 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/tms570_gio.h" +#include "hardware/tms570_gio.h" #include "tms570_gio.h" /**************************************************************************** diff --git a/arch/arm/src/tms570/tms570_gio.h b/arch/arm/src/tms570/tms570_gio.h index 45fa7073fb0..e509a81a646 100644 --- a/arch/arm/src/tms570/tms570_gio.h +++ b/arch/arm/src/tms570/tms570_gio.h @@ -46,7 +46,7 @@ #include #include -#include "chip/tms570_gio.h" +#include "hardware/tms570_gio.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/tms570/tms570_gioirq.c b/arch/arm/src/tms570/tms570_gioirq.c index b4b5cf327b2..4c7d1c03386 100644 --- a/arch/arm/src/tms570/tms570_gioirq.c +++ b/arch/arm/src/tms570/tms570_gioirq.c @@ -54,7 +54,7 @@ #include "up_internal.h" #include "tms570_gio.h" -#include "chip/tms570_gio.h" +#include "hardware/tms570_gio.h" #ifdef CONFIG_TMS570_GIO_IRQ diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c index 44d423b4707..87b74952672 100644 --- a/arch/arm/src/tms570/tms570_irq.c +++ b/arch/arm/src/tms570/tms570_irq.c @@ -51,7 +51,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/tms570_vim.h" +#include "hardware/tms570_vim.h" #include "tms570_gio.h" #include "tms570_esm.h" #include "tms570_irq.h" diff --git a/arch/arm/src/tms570/tms570_lowputc.c b/arch/arm/src/tms570/tms570_lowputc.c index cba122a546d..e9ae4824303 100644 --- a/arch/arm/src/tms570/tms570_lowputc.c +++ b/arch/arm/src/tms570/tms570_lowputc.c @@ -54,8 +54,8 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/tms570_sci.h" -#include "chip/tms570_iomm.h" +#include "hardware/tms570_sci.h" +#include "hardware/tms570_iomm.h" #include "tms570_lowputc.h" /**************************************************************************** diff --git a/arch/arm/src/tms570/tms570_selftest.c b/arch/arm/src/tms570/tms570_selftest.c index 3abb8d71224..8a1d55aaf14 100644 --- a/arch/arm/src/tms570/tms570_selftest.c +++ b/arch/arm/src/tms570/tms570_selftest.c @@ -52,8 +52,8 @@ #include "up_arch.h" -#include "chip/tms570_sys.h" -#include "chip/tms570_pbist.h" +#include "hardware/tms570_sys.h" +#include "hardware/tms570_pbist.h" #include "tms570_selftest.h" #ifdef CONFIG_TMS570_SELFTEST diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c index f1f39003114..2313d4d142b 100644 --- a/arch/arm/src/tms570/tms570_serial.c +++ b/arch/arm/src/tms570/tms570_serial.c @@ -62,7 +62,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/tms570_sci.h" +#include "hardware/tms570_sci.h" #include "tms570_lowputc.h" /**************************************************************************** diff --git a/arch/arm/src/tms570/tms570_timerisr.c b/arch/arm/src/tms570/tms570_timerisr.c index 38b5072c3dd..33962249ef0 100644 --- a/arch/arm/src/tms570/tms570_timerisr.c +++ b/arch/arm/src/tms570/tms570_timerisr.c @@ -46,7 +46,7 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/tms570_rti.h" +#include "hardware/tms570_rti.h" #include