From c404eae71849f4c7b91dca25da5762f7684221db Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 3 Mar 2016 09:12:13 -0600 Subject: [PATCH] Costmetic update to comments --- arch/arm/src/armv7-a/arm_gic.c | 6 +++--- arch/arm/src/imx6/chip/imx_memorymap.h | 5 +++++ arch/arm/src/imx6/imx_boot.c | 12 ++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/armv7-a/arm_gic.c b/arch/arm/src/armv7-a/arm_gic.c index 7368656801..19d89120c1 100644 --- a/arch/arm/src/armv7-a/arm_gic.c +++ b/arch/arm/src/armv7-a/arm_gic.c @@ -111,7 +111,7 @@ uint32_t *arm_decodeirq(uint32_t *regs) void up_enable_irq(int irq) { -# warning Missnig logic +# warning Missing logic } /**************************************************************************** @@ -130,7 +130,7 @@ void up_enable_irq(int irq) void up_disable_irq(int irq) { -# warning Missnig logic +# warning Missing logic } /**************************************************************************** @@ -146,7 +146,7 @@ void up_disable_irq(int irq) int up_prioritize_irq(int irq, int priority) { -# warning Missnig logic +# warning Missing logic return OK; } diff --git a/arch/arm/src/imx6/chip/imx_memorymap.h b/arch/arm/src/imx6/chip/imx_memorymap.h index a9353940d0..ff3b51eb83 100644 --- a/arch/arm/src/imx6/chip/imx_memorymap.h +++ b/arch/arm/src/imx6/chip/imx_memorymap.h @@ -925,6 +925,11 @@ #define VECTOR_TABLE_SIZE 0x00010000 +/* REVISIT: These definitions are not used: The vector table is at some + * arbitrary (but aligned) position in RAM or NOR FLASH and is positioned + * using the VBAR register. + */ + #ifdef CONFIG_ARCH_LOWVECTORS /* Vectors located at 0x0000:0000 */ /* Vectors will always lie at the beginnin of OCRAM */ diff --git a/arch/arm/src/imx6/imx_boot.c b/arch/arm/src/imx6/imx_boot.c index 3d6e38d7fe..d57c938408 100644 --- a/arch/arm/src/imx6/imx_boot.c +++ b/arch/arm/src/imx6/imx_boot.c @@ -266,8 +266,8 @@ static void imx_copyvectorblock(void) /* Copy the vectors into OCRAM at the address that will be mapped to the vector * address: * - * IMX_VECTOR_PADDR - Unmapped, physical address of vector table in SRAM - * IMX_VECTOR_VSRAM - Virtual address of vector table in SRAM + * IMX_VECTOR_PADDR - Unmapped, physical address of vector table in OCRAM + * IMX_VECTOR_VSRAM - Virtual address of vector table in OCRAM * IMX_VECTOR_VADDR - Virtual address of vector table (0x00000000 or * 0xffff0000) */ @@ -395,7 +395,7 @@ static inline void imx_wdtdisable(void) * memories (NVM): SPI0 CS0 Flash Boot, SD Card Boot, NAND Flash Boot, * SPI0 CS1 Flash Boot, or TWI EEPROM Boot. Different heuristics are * used with each media type. If a valid image is found, it is copied - * to internal SRAM and started. + * to internal OCRAM and started. * ****************************************************************************/ @@ -407,13 +407,13 @@ void up_boot(void) #endif #ifndef CONFIG_ARCH_ROMPGTABLE - /* __start provided the basic MMU mappings for SRAM. Now provide mappings + /* __start provided the basic MMU mappings for OCRAM. Now provide mappings * for all IO regions (Including the vector region). */ imx_setupmappings(); - /* Provide a special mapping for the IRAM interrupt vector positioned in + /* Provide a special mapping for the OCRAM interrupt vector positioned in * high memory. */ @@ -423,7 +423,7 @@ void up_boot(void) #ifdef CONFIG_ARCH_RAMFUNCS /* Copy any necessary code sections from FLASH to RAM. The correct - * destination in SRAM is given by _sramfuncs and _eramfuncs. The + * destination in OCRAM is given by _sramfuncs and _eramfuncs. The * temporary location is in flash after the data initialization code * at _framfuncs */