summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-23 00:00:34 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-23 00:00:34 +0000
commitd81a9a7a14a21c3ec0512bc207825a67861c092c (patch)
tree9413dd89b07c1665ec7593a32c09197ee0f1e7c1 /c
parentUpdate. (diff)
downloadrtems-d81a9a7a14a21c3ec0512bc207825a67861c092c.tar.bz2
2009-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac: Disable network interface when networking is disabled.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/psim/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/psim/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/psim/configure.ac4
3 files changed, 11 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index 2bba93c0c9..8e44bc2f1f 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * Makefile.am, configure.ac: Disable network interface when networking
+ is disabled.
+
2009-09-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Remove RTEMS_BSP_BOOTCARD_OPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index face282e53..4d06e35c03 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -69,7 +69,9 @@ libbsp_a_SOURCES += \
shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
endif
+if HAS_NETWORKING
libbsp_a_SOURCES += network/if_sim.c
+endif
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac
index cc7d0ddb76..52d179e342 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.ac
+++ b/c/src/lib/libbsp/powerpc/psim/configure.ac
@@ -15,6 +15,10 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
+RTEMS_CHECK_NETWORKING
+
+AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
+
RTEMS_CONFIG_BUILD_SUBDIRS(tools)
RTEMS_BSPOPTS_SET([PPC_USE_SPRG],[*],[0])