diff options
Diffstat (limited to 'nuttx/configs/sam3u-ek')
-rwxr-xr-x | nuttx/configs/sam3u-ek/kernel/Makefile | 12 | ||||
-rw-r--r-- | nuttx/configs/sam3u-ek/kernel/kernel.ld | 6 | ||||
-rwxr-xr-x | nuttx/configs/sam3u-ek/knsh/defconfig | 3 | ||||
-rwxr-xr-x | nuttx/configs/sam3u-ek/nsh/defconfig | 3 | ||||
-rwxr-xr-x | nuttx/configs/sam3u-ek/nx/defconfig | 3 | ||||
-rwxr-xr-x | nuttx/configs/sam3u-ek/ostest/defconfig | 3 |
6 files changed, 15 insertions, 15 deletions
diff --git a/nuttx/configs/sam3u-ek/kernel/Makefile b/nuttx/configs/sam3u-ek/kernel/Makefile index 38abe2b0a..5f7d939b2 100755 --- a/nuttx/configs/sam3u-ek/kernel/Makefile +++ b/nuttx/configs/sam3u-ek/kernel/Makefile @@ -88,14 +88,20 @@ $(BOARD_INCLUDE)/user_map.h: $(TOPDIR)/User.map @echo "/* General memory map */" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_ENTRYPOINT 0x`grep \" user_start$\" $(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 CONFIG_USER_DATADESTSTART 0x`grep \" _sdata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h - @echo "#define CONFIG_USER_DATADESTEND 0x`grep \" _edata$\" $(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 CONFIG_USER_DATADESTSTART 0x`grep \" _sdata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_DATADESTEND 0x`grep \" _edata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "/* Memory manager entry points */" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_MMINIT 0x`grep \" mm_initialize$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_MMADDREGION 0x`grep \" mm_addregion$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_TRYSEM 0x`grep \" mm_trysemaphore$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_GIVSEM 0x`grep \" mm_givesemaphore$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_MALLOC 0x`grep \" malloc$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_REALLOC 0x`grep \" realloc$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h + @echo "#define CONFIG_USER_ZALLOC 0x`grep \" zalloc$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_FREE 0x`grep \" free$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "#endif /* __ARCH_BOARD_USER_MAP_H */" >> $(BOARD_INCLUDE)/user_map.h diff --git a/nuttx/configs/sam3u-ek/kernel/kernel.ld b/nuttx/configs/sam3u-ek/kernel/kernel.ld index 267963978..b15188787 100644 --- a/nuttx/configs/sam3u-ek/kernel/kernel.ld +++ b/nuttx/configs/sam3u-ek/kernel/kernel.ld @@ -70,8 +70,14 @@ EXTERN(user_start) # Currently, the plan is that the memory manager will reside in user-space # but be usable both by kernel- and user-space code +EXTERN(mm_initialize) +EXTERN(mm_addregion) +EXTERN(mm_trysemaphore) +EXTERN(mm_givesemaphore) + EXTERN(malloc) EXTERN(realloc) +EXTERN(zalloc) EXTERN(free) OUTPUT_ARCH(arm) diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig index 6602685c5..b2bed075a 100755 --- a/nuttx/configs/sam3u-ek/knsh/defconfig +++ b/nuttx/configs/sam3u-ek/knsh/defconfig @@ -397,9 +397,6 @@ CONFIG_ARCH_STRNCPY=n CONFIG_ARCH_STRLEN=n CONFIG_ARCH_STRNLEN=n CONFIG_ARCH_BZERO=n -CONFIG_ARCH_KMALLOC=n -CONFIG_ARCH_KZMALLOC=n -CONFIG_ARCH_KFREE=n # # Sizes of configurable things (0 disables) diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 5e44d5fe5..d1b271e28 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -370,9 +370,6 @@ CONFIG_ARCH_STRNCPY=n CONFIG_ARCH_STRLEN=n CONFIG_ARCH_STRNLEN=n CONFIG_ARCH_BZERO=n -CONFIG_ARCH_KMALLOC=n -CONFIG_ARCH_KZMALLOC=n -CONFIG_ARCH_KFREE=n # # Sizes of configurable things (0 disables) diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 6c11f93ae..f06c2c234 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -371,9 +371,6 @@ CONFIG_ARCH_STRNCPY=n CONFIG_ARCH_STRLEN=n CONFIG_ARCH_STRNLEN=n CONFIG_ARCH_BZERO=n -CONFIG_ARCH_KMALLOC=n -CONFIG_ARCH_KZMALLOC=n -CONFIG_ARCH_KFREE=n # # Sizes of configurable things (0 disables) diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index f5991cdc5..a90e7cc7a 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -371,9 +371,6 @@ CONFIG_ARCH_STRNCPY=n CONFIG_ARCH_STRLEN=n CONFIG_ARCH_STRNLEN=n CONFIG_ARCH_BZERO=n -CONFIG_ARCH_KMALLOC=n -CONFIG_ARCH_KZMALLOC=n -CONFIG_ARCH_KFREE=n # # Sizes of configurable things (0 disables) |