Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-10-03 20:27:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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
#
# 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>
#
# 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

2
nshlib/nsh_netinit.c
View file

@ -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