diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-08 18:36:51 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-08 18:36:51 +0000 |
| commit | 3827c27291d092af800849b80dbceec22362eeea (patch) | |
| tree | 827f81e6b55b110a382ba12ed866f3c13fafe1f3 /nuttx/arch/arm/src/sam3u | |
| parent | 6e2d7acadee16e937aa340bec1cb4f5c86986c35 (diff) | |
Completes implementation of kernel mode build
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3483 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/sam3u')
| -rwxr-xr-x | nuttx/arch/arm/src/sam3u/Make.defs | 6 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c | 35 |
2 files changed, 40 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/sam3u/Make.defs b/nuttx/arch/arm/src/sam3u/Make.defs index 51e134d0b0..05b27cb222 100755 --- a/nuttx/arch/arm/src/sam3u/Make.defs +++ b/nuttx/arch/arm/src/sam3u/Make.defs @@ -48,6 +48,12 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \ up_sigdeliver.c up_unblocktask.c up_usestack.c up_doirq.c \ up_hardfault.c up_svcall.c +# Configuration-dependent common files + +ifeq ($(CONFIG_NUTTX_KERNEL),y) +CHIP_CSRCS += up_mpu.c +endif + # Required SAM3U files CHIP_ASRCS = diff --git a/nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c b/nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c index 411fba9b1b..2dacd36c81 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c +++ b/nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c @@ -39,6 +39,7 @@ #include <nuttx/config.h> #include <arch/board/user_map.h> +#include "mpu.h" #ifndef CONFIG_NUTTX_KERNEL @@ -46,6 +47,14 @@ * Private Definitions ****************************************************************************/ +#ifndef MAX +# define MAX(a,b) a > b ? a : b +#endif + +#ifndef MIN +# define MIN(a,b) a < b ? a : b +#endif + /**************************************************************************** * Private Data ****************************************************************************/ @@ -69,7 +78,31 @@ void sam3u_mpuinitialize(void) { -# warning "Not implemented" + uintptr_t datastart = MIN(ONFIG_USER_DATADESTSTART, CONFIG_USER_BSSSTART); + uintptr_t dataend = MAX(ONFIG_USER_DATADESTEND, CONFIG_USER_BSSEND); + + DEBUGASSERT(CONFIG_USER_TEXTEND >= CONFIG_USER_TEXTSTART && dataend >= datastart); + + @echo "#define C 0x`grep \" _stext\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define 0x`grep \" _etext$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_DATASOURCE 0x`grep \" _eronly$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define C 0x`grep \" _sdata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_ 0x`grep \" _edata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define 0x`grep \" _sbss\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_ 0x`grep \" _ebss$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + + /* Show MPU information */ + + mpu_showtype(); + + /* Configure user flash and SRAM space */ + + mpu_userflash(0, CONFIG_USER_TEXTSTART, CONFIG_USER_TEXTEND - CONFIG_USER_TEXTSTART); + mpu_userintsram(1, datastart, dataend - datastart); + + /* Then enable the MPU */ + + mpu_control(true, false, true); } #endif /* CONFIG_NUTTX_KERNEL */ |