diff options
Diffstat (limited to 'nuttx')
| -rwxr-xr-x | nuttx/configs/vsn/nsh/appconfig | 10 | ||||
| -rw-r--r-- | nuttx/graphics/nxbe/nxbe_colormap.c | 2 | ||||
| -rw-r--r-- | nuttx/sched/clock_gettime.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig index f5125bc65..46f978c90 100755 --- a/nuttx/configs/vsn/nsh/appconfig +++ b/nuttx/configs/vsn/nsh/appconfig @@ -66,13 +66,17 @@ CONFIGURED_APPS += vsn/sdcard # Provide RAMTRON tool CONFIGURED_APPS += vsn/ramtron -# Provide UNIX style free -CONFIGURED_APPS += vsn/free - # Provide System Information Utilityu CONFIGURED_APPS += vsn/sysinfo # Provide JAVA Virtual Machine (the Darjeeling JVM) #CONFIGURED_APPS += vsn/jvm +# Provide UNIX style free +CONFIGURED_APPS += system/free + +# Provide FLASH program installation support +CONFIGURED_APPS += system/install + + diff --git a/nuttx/graphics/nxbe/nxbe_colormap.c b/nuttx/graphics/nxbe/nxbe_colormap.c index 31072fb16..f38c0d6ca 100644 --- a/nuttx/graphics/nxbe/nxbe_colormap.c +++ b/nuttx/graphics/nxbe/nxbe_colormap.c @@ -80,7 +80,7 @@ ****************************************************************************/ #if CONFIG_FB_CMAP -int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be) +int nxbe_colormap(FAR NX_DRIVERTYPE *dev) { struct fb_cmap_s cmap; uint8_t *alloc; diff --git a/nuttx/sched/clock_gettime.c b/nuttx/sched/clock_gettime.c index 59e5b604c..5f975f52b 100644 --- a/nuttx/sched/clock_gettime.c +++ b/nuttx/sched/clock_gettime.c @@ -89,9 +89,11 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) { +#ifndef CONFIG_SYSTEM_UTC uint32_t msecs; uint32_t secs; uint32_t nsecs; +#endif int ret = OK; sdbg("clock_id=%d\n", clock_id); |