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

Merge remote-tracking branch 'origin/master' into armv7r

Browse Source
This commit is contained in:
Gregory Nutt 2015-12-14 13:58:08 -06:00
commit 290e5058ea
23 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/Kconfig
View File

@ -416,7 +416,7 @@ config ARCH_DPFPU
Enable toolchain support for double precision (64-bit) floating
point if both the toolchain and the hardware support it.
config ARMV7M_MPU
config ARM_MPU
bool "MPU support"
default n
depends on ARCH_HAVE_MPU
@ -426,11 +426,11 @@ config ARMV7M_MPU
Check your chip specifications first; not all Cortex-M3/4 chips
support the MPU.
config ARMV7M_MPU_NREGIONS
config ARM_MPU_NREGIONS
int "Number of MPU regions"
default 16 if ARCH_CORTEXM7
default 8 if !ARCH_CORTEXM7
depends on ARMV7M_MPU
depends on ARM_MPU
---help---
This is the number of protection regions supported by the MPU.

6
arch/arm/src/armv7-m/up_mpu.c
View File

@ -50,8 +50,8 @@
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_ARMV7M_MPU_NREGIONS
# define CONFIG_ARMV7M_MPU_NREGIONS 8
#ifndef CONFIG_ARM_MPU_NREGIONS
# define CONFIG_ARM_MPU_NREGIONS 8
#endif
/****************************************************************************
@ -210,7 +210,7 @@ static inline uint32_t mpu_subregion_ls(size_t offset, uint8_t l2size)
unsigned int mpu_allocregion(void)
{
DEBUGASSERT(g_region < CONFIG_ARMV7M_MPU_NREGIONS);
DEBUGASSERT(g_region < CONFIG_ARM_MPU_NREGIONS);
return (unsigned int)g_region++;
}

4
arch/arm/src/efm32/efm32_irq.c
View File

@ -439,7 +439,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(EFM32_IRQ_MEMFAULT, up_memfault);
up_enable_irq(EFM32_IRQ_MEMFAULT);
#endif
@ -448,7 +448,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(EFM32_IRQ_NMI, efm32_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(EFM32_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(EFM32_IRQ_BUSFAULT, efm32_busfault);

4
arch/arm/src/kinetis/kinetis_irq.c
View File

@ -411,7 +411,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(KINETIS_IRQ_MEMFAULT, up_memfault);
up_enable_irq(KINETIS_IRQ_MEMFAULT);
#endif
@ -420,7 +420,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(KINETIS_IRQ_NMI, kinetis_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(KINETIS_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(KINETIS_IRQ_BUSFAULT, kinetis_busfault);

4
arch/arm/src/kinetis/kinetis_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "kinetis_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -120,5 +120,5 @@ void kinetis_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */

4
arch/arm/src/lpc17xx/lpc17_irq.c
View File

@ -383,7 +383,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(LPC17_IRQ_MEMFAULT, up_memfault);
up_enable_irq(LPC17_IRQ_MEMFAULT);
#endif
@ -392,7 +392,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(LPC17_IRQ_NMI, lpc17_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(LPC17_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(LPC17_IRQ_BUSFAULT, lpc17_busfault);

4
arch/arm/src/lpc17xx/lpc17_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "lpc17_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -120,5 +120,5 @@ void lpc17_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */

4
arch/arm/src/lpc43xx/lpc43_irq.c
View File

@ -386,7 +386,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(LPC43_IRQ_MEMFAULT, up_memfault);
up_enable_irq(LPC43_IRQ_MEMFAULT);
#endif
@ -395,7 +395,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(LPC43_IRQ_NMI, lpc43_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(LPC43_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(LPC43_IRQ_BUSFAULT, lpc43_busfault);

4
arch/arm/src/lpc43xx/lpc43_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "lpc43_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -120,5 +120,5 @@ void lpc43_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */

4
arch/arm/src/sam34/sam_irq.c
View File

@ -447,7 +447,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
up_enable_irq(SAM_IRQ_MEMFAULT);
#endif
@ -456,7 +456,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(SAM_IRQ_NMI, sam_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);

4
arch/arm/src/sam34/sam_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "sam_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -120,5 +120,5 @@ void sam_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */

2
arch/arm/src/samv7/Kconfig
View File

@ -384,7 +384,7 @@ config SAMV7_QSPI
bool "Quad SPI (QSPI)"
default n
select ARCH_USE_MPU
select ARMV7M_MPU
select ARM_MPU
config SAMV7_RTC
bool "Real Time Clock (RTC)"

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

@ -90,7 +90,7 @@ ifeq ($(CONFIG_ARCH_MEMCPY),y)
CMN_ASRCS += up_memcpy.S
endif
ifeq ($(CONFIG_ARMV7M_MPU),y)
ifeq ($(CONFIG_ARM_MPU),y)
CMN_CSRCS += up_mpu.c
ifeq ($(CONFIG_BUILD_PROTECTED),y)
CMN_CSRCS += up_task_start.c up_pthread_start.c
@ -123,7 +123,7 @@ ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += sam_timerisr.c
endif
ifeq ($(CONFIG_ARMV7M_MPU),y)
ifeq ($(CONFIG_ARM_MPU),y)
CHIP_CSRCS += sam_mpuinit.c
ifeq ($(CONFIG_BUILD_PROTECTED),y)
CHIP_CSRCS += sam_userspace.c

4
arch/arm/src/samv7/sam_irq.c
View File

@ -447,7 +447,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
up_enable_irq(SAM_IRQ_MEMFAULT);
#endif
@ -456,7 +456,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(SAM_IRQ_NMI, sam_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);

4
arch/arm/src/samv7/sam_mpuinit.c
View File

@ -49,7 +49,7 @@
#include "sam_mpuinit.h"
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
/****************************************************************************
* Pre-processor Definitions
@ -146,5 +146,5 @@ void sam_mpu_uheap(uintptr_t start, size_t size)
}
#endif
#endif /* CONFIG_ARMV7M_MPU */
#endif /* CONFIG_ARM_MPU */

2
arch/arm/src/samv7/sam_mpuinit.h
View File

@ -77,7 +77,7 @@ extern "C"
*
****************************************************************************/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
void sam_mpu_initialize(void);
#else
# define sam_mpu_initialize()

2
arch/arm/src/samv7/sam_start.c
View File

@ -367,7 +367,7 @@ void __start(void)
sam_boardinitialize();
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
/* For the case of the separate user-/kernel-space build, perform whatever
* platform specific initialization of the user memory is required.
* Normally this just means initializing the user space .data and .bss

4
arch/arm/src/stm32/stm32_irq.c
View File

@ -394,7 +394,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
up_enable_irq(STM32_IRQ_MEMFAULT);
#endif
@ -403,7 +403,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(STM32_IRQ_NMI, stm32_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault);

4
arch/arm/src/stm32/stm32_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "stm32_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -120,5 +120,5 @@ void stm32_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */

4
arch/arm/src/stm32f7/stm32_irq.c
View File

@ -481,7 +481,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
up_enable_irq(STM32_IRQ_MEMFAULT);
#endif
@ -490,7 +490,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(STM32_IRQ_NMI, stm32_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault);

4
arch/arm/src/stm32f7/stm32_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "stm32_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -112,5 +112,5 @@ void stm32_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */

4
arch/arm/src/tiva/tiva_irq.c
View File

@ -465,7 +465,7 @@ void up_irqinitialize(void)
* Fault handler.
*/
#ifdef CONFIG_ARMV7M_MPU
#ifdef CONFIG_ARM_MPU
irq_attach(TIVA_IRQ_MEMFAULT, up_memfault);
up_enable_irq(TIVA_IRQ_MEMFAULT);
#endif
@ -474,7 +474,7 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(TIVA_IRQ_NMI, tiva_nmi);
#ifndef CONFIG_ARMV7M_MPU
#ifndef CONFIG_ARM_MPU
irq_attach(TIVA_IRQ_MEMFAULT, up_memfault);
#endif
irq_attach(TIVA_IRQ_BUSFAULT, tiva_busfault);

4
arch/arm/src/tiva/tiva_mpuinit.c
View File

@ -46,7 +46,7 @@
#include "mpu.h"
#include "tiva_mpuinit.h"
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
@ -120,5 +120,5 @@ void tiva_mpu_uheap(uintptr_t start, size_t size)
mpu_user_intsram(start, size);
}
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARM_MPU */