Fix some ARMv7-M syscall logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5736 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-03-12 21:53:18 +00:00
parent 7586e0b134
commit 45758cc6c2
4 changed files with 26 additions and 17 deletions

View File

@ -342,6 +342,10 @@ CONFIGURATION
in FLASH. But loading the nuttx ELF does not harm the nuttx_user.elf in FLASH. But loading the nuttx ELF does not harm the nuttx_user.elf
in FLASH. Conclusion: Always load nuttx_user.elf before nuttx. in FLASH. Conclusion: Always load nuttx_user.elf before nuttx.
Just to complicate matters, it is sometimes the case that you need
load objects twice to account for write failures. I have not yet
found a simple foolproof way to reliably get the code into FLASH.
nsh nsh
--- ---
Configures the NuttShell (nsh) located at examples/nsh. The Configures the NuttShell (nsh) located at examples/nsh. The

View File

@ -107,7 +107,7 @@ depend: .depend
clean: clean:
$(call DELFILE, nuttx_user.elf) $(call DELFILE, nuttx_user.elf)
$(call DELFILE, "$(TOPDIR)$(DELIM)nuttx_user.elf") $(call DELFILE, "$(TOPDIR)$(DELIM)nuttx_user.*")
$(call DELFILE, "$(TOPDIR)$(DELIM)User.map") $(call DELFILE, "$(TOPDIR)$(DELIM)User.map")
$(call CLEAN) $(call CLEAN)

View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sam3u-ek/kernel/Makefile # configs/sam3u-ek/kernel/Makefile
# #
# Copyright (C) 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -107,7 +107,7 @@ depend: .depend
clean: clean:
$(call DELFILE, nuttx_user.elf) $(call DELFILE, nuttx_user.elf)
$(call DELFILE, "$(TOPDIR)$(DELIM)nuttx_user.elf") $(call DELFILE, "$(TOPDIR)$(DELIM)nuttx_user.*")
$(call DELFILE, "$(TOPDIR)$(DELIM)User.map") $(call DELFILE, "$(TOPDIR)$(DELIM)User.map")
$(call CLEAN) $(call CLEAN)

View File

@ -40,7 +40,6 @@ CONFIG_HOST_LINUX=y
# #
CONFIG_DEBUG=y CONFIG_DEBUG=y
CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_VERBOSE=y
# CONFIG_SYSLOG_ENABLE is not set
# #
# Subsystem Debug Options # Subsystem Debug Options
@ -74,7 +73,6 @@ CONFIG_ARCH_SIM=y
# CONFIG_ARCH_Z16 is not set # CONFIG_ARCH_Z16 is not set
# CONFIG_ARCH_Z80 is not set # CONFIG_ARCH_Z80 is not set
CONFIG_ARCH="sim" CONFIG_ARCH="sim"
CONFIG_BOARD_LOOPSPERMSEC=100
# #
# Simulation Configuration Options # Simulation Configuration Options
@ -103,6 +101,8 @@ CONFIG_BOARD_LOOPSPERMSEC=100
# #
# Board Settings # Board Settings
# #
CONFIG_BOARD_LOOPSPERMSEC=100
# CONFIG_ARCH_CALIBRATION is not set
CONFIG_DRAM_START=0x00000000 CONFIG_DRAM_START=0x00000000
CONFIG_DRAM_SIZE=0 CONFIG_DRAM_SIZE=0
@ -133,6 +133,7 @@ CONFIG_ARCH_BOARD="sim"
# #
# RTOS Features # RTOS Features
# #
# CONFIG_BOARD_INITIALIZE is not set
CONFIG_MSEC_PER_TICK=10 CONFIG_MSEC_PER_TICK=10
CONFIG_RR_INTERVAL=0 CONFIG_RR_INTERVAL=0
# CONFIG_SCHED_INSTRUMENTATION is not set # CONFIG_SCHED_INSTRUMENTATION is not set
@ -149,8 +150,8 @@ CONFIG_MUTEX_TYPES=y
# CONFIG_FDCLONE_DISABLE is not set # CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set # CONFIG_FDCLONE_STDIO is not set
CONFIG_SDCLONE_DISABLE=y CONFIG_SDCLONE_DISABLE=y
# CONFIG_SCHED_WORKQUEUE is not set
CONFIG_SCHED_WAITPID=y CONFIG_SCHED_WAITPID=y
# CONFIG_SCHED_STARTHOOK is not set
# CONFIG_SCHED_ATEXIT is not set # CONFIG_SCHED_ATEXIT is not set
# CONFIG_SCHED_ONEXIT is not set # CONFIG_SCHED_ONEXIT is not set
CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USER_ENTRYPOINT="ostest_main"
@ -160,9 +161,7 @@ CONFIG_DISABLE_OS_API=y
# CONFIG_DISABLE_PTHREAD is not set # CONFIG_DISABLE_PTHREAD is not set
# CONFIG_DISABLE_SIGNALS is not set # CONFIG_DISABLE_SIGNALS is not set
# CONFIG_DISABLE_MQUEUE is not set # CONFIG_DISABLE_MQUEUE is not set
# CONFIG_DISABLE_MOUNTPOINT is not set
# CONFIG_DISABLE_ENVIRON is not set # CONFIG_DISABLE_ENVIRON is not set
CONFIG_DISABLE_POLL=y
# #
# Signal Numbers # Signal Numbers
@ -199,6 +198,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=8192
# #
# Device Drivers # Device Drivers
# #
CONFIG_DISABLE_POLL=y
CONFIG_DEV_NULL=y CONFIG_DEV_NULL=y
# CONFIG_DEV_ZERO is not set # CONFIG_DEV_ZERO is not set
# CONFIG_LOOP is not set # CONFIG_LOOP is not set
@ -249,6 +249,7 @@ CONFIG_SERIAL=y
# #
# File system configuration # File system configuration
# #
# CONFIG_DISABLE_MOUNTPOINT is not set
# CONFIG_FS_RAMMAP is not set # CONFIG_FS_RAMMAP is not set
# CONFIG_FS_FAT is not set # CONFIG_FS_FAT is not set
# CONFIG_FS_NXFFS is not set # CONFIG_FS_NXFFS is not set
@ -257,6 +258,7 @@ CONFIG_SERIAL=y
# #
# System Logging # System Logging
# #
# CONFIG_SYSLOG_ENABLE is not set
# CONFIG_SYSLOG is not set # CONFIG_SYSLOG is not set
# #
@ -267,6 +269,7 @@ CONFIG_SERIAL=y
# #
# Memory Management # Memory Management
# #
# CONFIG_MM_MULTIHEAP is not set
# CONFIG_MM_SMALL is not set # CONFIG_MM_SMALL is not set
CONFIG_MM_REGIONS=1 CONFIG_MM_REGIONS=1
# CONFIG_GRAN is not set # CONFIG_GRAN is not set
@ -301,6 +304,8 @@ CONFIG_LIB_HOMEDIR="/"
# CONFIG_EOL_IS_BOTH_CRLF is not set # CONFIG_EOL_IS_BOTH_CRLF is not set
CONFIG_EOL_IS_EITHER_CRLF=y CONFIG_EOL_IS_EITHER_CRLF=y
# CONFIG_LIBC_EXECFUNCS is not set # CONFIG_LIBC_EXECFUNCS is not set
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
# CONFIG_LIBC_STRERROR is not set # CONFIG_LIBC_STRERROR is not set
# CONFIG_LIBC_PERROR_STDOUT is not set # CONFIG_LIBC_PERROR_STDOUT is not set
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
@ -309,8 +314,9 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
# #
# Non-standard Helper Functions # Non-standard Library Support
# #
# CONFIG_SCHED_WORKQUEUE is not set
# CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_KBDCODEC is not set
# #
@ -332,7 +338,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_EXAMPLES_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
@ -348,7 +353,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_MM is not set # CONFIG_EXAMPLES_MM is not set
# CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_MOUNT is not set
# CONFIG_EXAMPLES_MODBUS is not set # CONFIG_EXAMPLES_MODBUS is not set
# CONFIG_EXAMPLES_NETTEST is not set
# CONFIG_EXAMPLES_NSH is not set # CONFIG_EXAMPLES_NSH is not set
# CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NULL is not set
# CONFIG_EXAMPLES_NX is not set # CONFIG_EXAMPLES_NX is not set
@ -387,8 +391,9 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_EXAMPLES_WATCHDOG is not set # CONFIG_EXAMPLES_WATCHDOG is not set
# #
# Interpreters # Graphics Support
# #
# CONFIG_TIFF is not set
# #
# Interpreters # Interpreters
@ -418,11 +423,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_WEBCLIENT is not set # CONFIG_NETUTILS_WEBCLIENT is not set
# #
# ModBus # FreeModBus
#
#
# FreeModbus
# #
# CONFIG_MODBUS is not set # CONFIG_MODBUS is not set
@ -477,3 +478,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# Sysinfo # Sysinfo
# #
# CONFIG_SYSTEM_SYSINFO is not set # CONFIG_SYSTEM_SYSINFO is not set
#
# USB Monitor
#