From 9d05dad6824c5b2bdea371924d79a2d3520b2841 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 11 Mar 2013 20:26:55 +0000 Subject: [PATCH] Reorganize some AT91SAM3U files; Add an NSH kernel build configuration to the WaveSahhare Open1788 board git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5732 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/lpc17xx/Kconfig | 2 +- arch/arm/src/lpc17xx/lpc17_allocateheap.c | 5 +++-- arch/arm/src/lpc17xx/lpc17_mpuinit.c | 2 +- arch/arm/src/sam3u/sam3u_allocateheap.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig index 797711fdc2..db76eeb77d 100644 --- a/arch/arm/src/lpc17xx/Kconfig +++ b/arch/arm/src/lpc17xx/Kconfig @@ -140,7 +140,7 @@ config LPC17_PLL1 default y config LPC17_EMC - bool "PLL1" + bool "EMC" default y depends on ARCH_FAMILY_LPC178X diff --git a/arch/arm/src/lpc17xx/lpc17_allocateheap.c b/arch/arm/src/lpc17xx/lpc17_allocateheap.c index b5cacce27e..9b699c6a6f 100644 --- a/arch/arm/src/lpc17xx/lpc17_allocateheap.c +++ b/arch/arm/src/lpc17xx/lpc17_allocateheap.c @@ -47,6 +47,7 @@ #include #include "chip.h" +#include "mpu.h" #include "up_arch.h" #include "up_internal.h" @@ -214,7 +215,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) DEBUGASSERT((CONFIG_DRAM_END & ((1 << log2) - 1)) == 0); usize = (1 << log2); - ubase = CONFIG_DRAM_END - usize + ubase = CONFIG_DRAM_END - usize; /* Return the user-space heap settings */ @@ -265,7 +266,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) DEBUGASSERT((CONFIG_DRAM_END & ((1 << log2) - 1)) == 0); usize = (1 << log2); - ubase = CONFIG_DRAM_END - usize + ubase = CONFIG_DRAM_END - usize; /* Return the kernel heap settings */ diff --git a/arch/arm/src/lpc17xx/lpc17_mpuinit.c b/arch/arm/src/lpc17xx/lpc17_mpuinit.c index 0a90229e75..c5d1ab11cc 100644 --- a/arch/arm/src/lpc17xx/lpc17_mpuinit.c +++ b/arch/arm/src/lpc17xx/lpc17_mpuinit.c @@ -44,7 +44,7 @@ #include #include "mpu.h" -#include "lp17_mpuinit.h" +#include "lpc17_mpuinit.h" #if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_ARMV7M_MPU) diff --git a/arch/arm/src/sam3u/sam3u_allocateheap.c b/arch/arm/src/sam3u/sam3u_allocateheap.c index 249777d69f..8f269491ed 100644 --- a/arch/arm/src/sam3u/sam3u_allocateheap.c +++ b/arch/arm/src/sam3u/sam3u_allocateheap.c @@ -48,6 +48,7 @@ #include #include "chip.h" +#include "mpu.h" #include "up_arch.h" #include "up_internal.h" #include "sam3u_internal.h" @@ -125,7 +126,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) DEBUGASSERT((CONFIG_DRAM_END & ((1 << log2) - 1)) == 0); usize = (1 << log2); - ubase = CONFIG_DRAM_END - usize + ubase = CONFIG_DRAM_END - usize; /* Return the user-space heap settings */ @@ -176,7 +177,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) DEBUGASSERT((CONFIG_DRAM_END & ((1 << log2) - 1)) == 0); usize = (1 << log2); - ubase = CONFIG_DRAM_END - usize + ubase = CONFIG_DRAM_END - usize; /* Return the kernel heap settings */