diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-03 08:44:42 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-03 08:44:42 -0600 |
| commit | 54d8dbca18876b27bb6c112850f32232dff906b6 (patch) | |
| tree | 6b5d65059511c600f9e6b1e1cb001a93e37d65f3 | |
| parent | 6cce7ea0ab8f3b30a642cd4345b67f547bc91b09 (diff) | |
| download | nuttx-54d8dbca18876b27bb6c112850f32232dff906b6.tar.gz nuttx-54d8dbca18876b27bb6c112850f32232dff906b6.tar.bz2 nuttx-54d8dbca18876b27bb6c112850f32232dff906b6.zip | |
configs/sim/nsh/defconfig -- refresh, enable wall-time, dow builds natively in 64-bit mode
| -rw-r--r-- | nuttx/arch/sim/include/irq.h | 5 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/up_internal.h | 4 | ||||
| -rw-r--r-- | nuttx/configs/sim/nsh/defconfig | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/nuttx/arch/sim/include/irq.h b/nuttx/arch/sim/include/irq.h index 41c9446eb..efe57f650 100644 --- a/nuttx/arch/sim/include/irq.h +++ b/nuttx/arch/sim/include/irq.h @@ -82,7 +82,7 @@ struct xcptcontext { void *sigdeliver; /* Actual type is sig_deliver_t */ - xcpt_reg_t regs[6]; + xcpt_reg_t regs[XCPTCONTEXT_REGS]; }; #endif @@ -111,7 +111,8 @@ static inline void irqrestore(irqstate_t flags) #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif diff --git a/nuttx/arch/sim/src/up_internal.h b/nuttx/arch/sim/src/up_internal.h index dd6b36071..ea20934fc 100644 --- a/nuttx/arch/sim/src/up_internal.h +++ b/nuttx/arch/sim/src/up_internal.h @@ -118,8 +118,8 @@ /* Compatibility definitions */ -# define JB_SP JB_RSI -# define JB_PC JB_RSP +# define JB_SP JB_RSP +# define JB_PC JB_RSI #else /* Storage order: %ebx, $esi, %edi, %ebp, sp, and return PC */ diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig index 1b4c905f1..056fb7762 100644 --- a/nuttx/configs/sim/nsh/defconfig +++ b/nuttx/configs/sim/nsh/defconfig @@ -67,10 +67,11 @@ CONFIG_ARCH="sim" # # Simulation Configuration Options # -CONFIG_SIM_M32=y CONFIG_HOST_X86_64=y # CONFIG_HOST_X86 is not set -# CONFIG_SIM_WALLTIME is not set +# CONFIG_SIM_M32 is not set +CONFIG_SIM_WALLTIME=y +# CONFIG_SIM_SPIFLASH is not set # # Architecture Options @@ -168,6 +169,9 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_RR_INTERVAL=0 CONFIG_TASK_NAME_SIZE=32 @@ -340,6 +344,8 @@ CONFIG_SERIAL=y # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set CONFIG_FS_READABLE=y CONFIG_FS_WRITABLE=y +# CONFIG_FS_NAMED_SEMAPHORES is not set +CONFIG_FS_MQUEUE_MPATH="/var/mqueue" # CONFIG_FS_RAMMAP is not set CONFIG_FS_FAT=y CONFIG_FAT_LCNAMES=y @@ -619,7 +625,9 @@ CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 CONFIG_NSH_ROMFSSECTSIZE=64 +CONFIG_NSH_DEFAULTROMFS=y # CONFIG_NSH_ARCHROMFS is not set +# CONFIG_NSH_CUSTOMROMFS is not set CONFIG_NSH_FATDEVNO=2 CONFIG_NSH_FATSECTSIZE=512 CONFIG_NSH_FATNSECTORS=1024 |