sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ieee802154

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-01 09:10:22 -06:00
commit e9e16c98cb
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/mm/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/examples/mm/Makefile # apps/examples/mm/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012, 2017 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
@ -37,13 +37,18 @@
# Memory Management Test # Memory Management Test
CONFIG_EXAMPLES_MM_PRIORITY ?= SCHED_PRIORITY_DEFAULT
CONFIG_EXAMPLES_MM_STACKSIZE ?= 2048
APPNAME = mm APPNAME = mm
PRIORITY = $(CONFIG_EXAMPLES_MM_PRIORITY)
STACKSIZE = $(CONFIG_EXAMPLES_MM_STACKSIZE)
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = mm_main.c MAINSRC = mm_main.c
CONFIG_XYZ_PROGNAME ?= mm$(EXEEXT) CONFIG_EXAMPLES_MM_PROGNAME ?= mm$(EXEEXT)
PROGNAME = $(CONFIG_XYZ_PROGNAME) PROGNAME = $(CONFIG_EXAMPLES_MM_PROGNAME)
include $(APPDIR)/Application.mk include $(APPDIR)/Application.mk

2
nshlib/nsh_netinit.c
View File

@ -120,6 +120,8 @@
#elif defined(CONFIG_NET_LOCAL) #elif defined(CONFIG_NET_LOCAL)
# define NET_DEVNAME "lo" # define NET_DEVNAME "lo"
# define NSH_HAVE_NETDEV # define NSH_HAVE_NETDEV
#elif defined(CONFIG_NET_USRSOCK)
# undef NSH_HAVE_NETDEV
#elif !defined(CONFIG_NET_LOOPBACK) #elif !defined(CONFIG_NET_LOOPBACK)
# error ERROR: No link layer protocol defined # error ERROR: No link layer protocol defined
#endif #endif