diff --git a/examples/mm/Makefile b/examples/mm/Makefile index 1a832863b..a74edc7a2 100644 --- a/examples/mm/Makefile +++ b/examples/mm/Makefile @@ -1,7 +1,7 @@ ############################################################################ # 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 # # Redistribution and use in source and binary forms, with or without @@ -37,13 +37,18 @@ # Memory Management Test +CONFIG_EXAMPLES_MM_PRIORITY ?= SCHED_PRIORITY_DEFAULT +CONFIG_EXAMPLES_MM_STACKSIZE ?= 2048 + APPNAME = mm +PRIORITY = $(CONFIG_EXAMPLES_MM_PRIORITY) +STACKSIZE = $(CONFIG_EXAMPLES_MM_STACKSIZE) ASRCS = CSRCS = MAINSRC = mm_main.c -CONFIG_XYZ_PROGNAME ?= mm$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) +CONFIG_EXAMPLES_MM_PROGNAME ?= mm$(EXEEXT) +PROGNAME = $(CONFIG_EXAMPLES_MM_PROGNAME) include $(APPDIR)/Application.mk diff --git a/nshlib/nsh_netinit.c b/nshlib/nsh_netinit.c index f49a45120..407802f5f 100644 --- a/nshlib/nsh_netinit.c +++ b/nshlib/nsh_netinit.c @@ -120,6 +120,8 @@ #elif defined(CONFIG_NET_LOCAL) # define NET_DEVNAME "lo" # define NSH_HAVE_NETDEV +#elif defined(CONFIG_NET_USRSOCK) +# undef NSH_HAVE_NETDEV #elif !defined(CONFIG_NET_LOOPBACK) # error ERROR: No link layer protocol defined #endif