summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-09-11 14:06:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-09-11 14:06:39 +0000
commit38feb6d51dfa842c0c51b63799aa53e9c689ada0 (patch)
tree86503257edf71557e6268901b052a5cc54bc896a /c
parent2007-09-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-38feb6d51dfa842c0c51b63799aa53e9c689ada0.tar.bz2
2007-09-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, include/bsp.h: Do not include networking drivers if networking is disabled.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/virtex/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/virtex/Makefile.am7
-rw-r--r--c/src/lib/libbsp/powerpc/virtex/include/bsp.h1
3 files changed, 11 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
index 892d0a96d6..a03d567a1b 100644
--- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-11 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * Makefile.am, include/bsp.h: Do not include networking
+ drivers if networking is disabled.
+
2007-09-10 Joel Sherrill <joel.sherrill@OARcorp.com>
* network/xiltemac.c: Remove duplicate prototype.
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index e129bf75f2..6f062aac73 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -12,7 +12,9 @@ dist_project_lib_DATA = bsp_specs
include_HEADERS = include/bsp.h
include_HEADERS += include/tm27.h
include_HEADERS += include/xparameters_dflt.h
+if HAS_NETWORKING
include_HEADERS += network/xiltemac.h
+endif
nodist_include_HEADERS = include/bspopts.h
DISTCLEANFILES = include/bspopts.h
@@ -82,7 +84,10 @@ noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
libbsp_a_LIBADD = startup.rel dlentry.rel bspconsole.rel opbintctrl.rel \
- vectors.rel irq.rel network.rel
+ vectors.rel irq.rel
+if HAS_NETWORKING
+libbsp_a_LIBADD += network.rel
+endif
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
index a5d67af1f3..e71ee284a9 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
@@ -68,7 +68,6 @@ extern "C" {
#include <rtems/clockdrv.h>
#include <rtems/console.h>
#include <rtems/iosupp.h>
-#include <rtems/rtems_bsdnet.h>
#include <bsp/irq.h>
#include <bsp/vectors.h>