summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-27 11:12:44 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-31 11:18:17 +0100
commitd8d6a08d4677e6c68fc94b7d182e3af61c3fd76e (patch)
treeb8ef1e0ecaf0792533d9b6aae95c050e83766fe2 /c/src/lib/libbsp/powerpc
parentepiphany: Workaround until next Newlib snapshot (diff)
downloadrtems-d8d6a08d4677e6c68fc94b7d182e3af61c3fd76e.tar.bz2
bsps: Move network define to source files
Define __INSIDE_RTEMS_BSD_TCPIP_STACK__ in the network interface driver source files to avoid some build system magic.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/gen83xx/Makefile.am12
-rw-r--r--c/src/lib/libbsp/powerpc/gen83xx/network/network.c1
-rw-r--r--c/src/lib/libbsp/powerpc/haleakala/Makefile.am10
-rw-r--r--c/src/lib/libbsp/powerpc/haleakala/network/network.c2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am13
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c3
-rw-r--r--c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c2
-rw-r--r--c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c3
-rw-r--r--c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c3
-rw-r--r--c/src/lib/libbsp/powerpc/virtex/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c8
14 files changed, 26 insertions, 66 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 5f9bad706e..e5d681153c 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -74,11 +74,8 @@ libbsp_a_SOURCES += i2c/i2c_init.c
libbsp_a_SOURCES += spi/spi_init.c
if HAS_NETWORKING
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/network.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS)
-network_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -D__BSD_VISIBLE
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += network/network.c
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mpc83xx/tsec.rel
endif
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
@@ -91,11 +88,6 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/mpc83xx/spi.rel \
../../../libcpu/@RTEMS_CPU@/mpc83xx/gtm.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mpc83xx/tsec.rel
-endif
-
EXTRA_DIST += README.mpc8349eamds
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/network/network.c b/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
index 316467feaf..b870673cd3 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
@@ -18,6 +18,7 @@
| of the network interface driver |
\*===============================================================*/
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
#include <rtems.h>
#include <rtems/rtems_bsdnet.h>
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 24b30661a1..022728651a 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -39,11 +39,7 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
libbsp_a_SOURCES += irq/irq_init.c irq/irq.c
if HAS_NETWORKING
-network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS = network.rel
-network_rel_SOURCES = network/network.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += network/network.c
endif
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -54,9 +50,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/powerpc/haleakala/headers.am
diff --git a/c/src/lib/libbsp/powerpc/haleakala/network/network.c b/c/src/lib/libbsp/powerpc/haleakala/network/network.c
index e8731cb954..f77b03648f 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/network/network.c
+++ b/c/src/lib/libbsp/powerpc/haleakala/network/network.c
@@ -12,6 +12,8 @@
*
*/
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
#include <bsp.h>
#include <stdio.h>
#include <errno.h>
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 96ec40e15f..bbc0a8e8b6 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -110,12 +110,7 @@ libbsp_a_SOURCES += ../../powerpc/shared/vme/vme_universe.c
if QEMU
if HAS_NETWORKING
-ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-ne2000_CPPFLAGS += '-Dbsp_cmdline_arg=rtems_bsp_cmdline_get_param_raw'
-noinst_PROGRAMS += ne2000.rel
-ne2000_rel_SOURCES = ../../i386/pc386/ne2000/ne2000.c
-ne2000_rel_CPPFLAGS = $(AM_CPPFLAGS) $(ne2000_CPPFLAGS)
-ne2000_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += ../../i386/pc386/ne2000/ne2000.c
endif
endif
@@ -132,12 +127,6 @@ libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
-if QEMU
-if HAS_NETWORKING
-libbsp_a_LIBADD+=ne2000.rel
-endif
-endif
-
EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \
README.MVME2400 \
README.OTHERBOARDS
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index bd84c6c0cc..1f9d2f189d 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -50,12 +50,8 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \
libbsp_a_SOURCES += ../../shared/bspreset.c
if HAS_NETWORKING
-network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-network_CPPFLAGS += -D__BSD_VISIBLE
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/network.c network/if_hdlcsubr.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += network/if_hdlcsubr.c
+libbsp_a_SOURCES += network/network.c
endif
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
@@ -66,9 +62,6 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
EXTRA_DIST += times
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
index a083b3978b..350efdbc22 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
@@ -47,6 +47,8 @@
* @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
*/
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
#include <rtems/rtems_bsdnet.h>
#include <sys/param.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
index 5e628963a6..fb87fc0e64 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
@@ -23,6 +23,9 @@
* Saskatoon, Saskatchewan, CANADA
* eric@skatter.usask.ca
*/
+
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
#include <bsp.h>
#include <bsp/irq.h>
#include <mpc8260.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c b/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
index e2bea25477..37a24099c0 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
@@ -44,6 +44,8 @@
* ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
*/
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
#include <rtems.h>
#include <rtems/error.h>
#include <bsp/irq.h>
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 5531021385..9173d6b527 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -58,11 +58,8 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \
libbsp_a_SOURCES += ../../shared/bspreset.c
if HAS_NETWORKING
-network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/network_scc.c network/network_fec.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += network/network_fec.c
+libbsp_a_SOURCES += network/network_scc.c
endif
libbsp_a_LIBADD = \
@@ -76,9 +73,5 @@ libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
index 11018ea632..71da617d8c 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
@@ -47,6 +47,9 @@
* and Charles-Antoine Gauthier <charles.gauthier@iit.nrc.ca>
* Copyright (c) 1999, National Research Council of Canada
*/
+
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
#include <bsp.h>
#include <stdio.h>
#include <errno.h>
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
index 133dc0f4a2..98acbb3e7a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
@@ -44,6 +44,9 @@
* and Charles-Antoine Gauthier <charles.gauthier@iit.nrc.ca>
* Copyright (c) 1999, National Research Council of Canada
*/
+
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
#include <bsp.h>
#include <stdio.h>
#include <errno.h>
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 232ec7b190..0c0e1081e0 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -59,12 +59,7 @@ libbsp_a_SOURCES += irq/irq_init.c
libbsp_a_SOURCES += ../shared/clock/clock.c
if HAS_NETWORKING
-network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-network_CPPFLAGS += -D__BSD_VISIBLE
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/xiltemac.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += = network/xiltemac.c
endif
# timer
@@ -77,9 +72,5 @@ libbsp_a_LIBADD += \
../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/powerpc/virtex/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c b/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c
index 0deef00288..1c3a461466 100644
--- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c
+++ b/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c
@@ -9,15 +9,9 @@
* http://www.rtems.org/license/LICENSE.
*
*/
-#define PPC_HAS_CLASSIC_EXCEPTIONS FALSE
-#ifndef __INSIDE_RTEMS_BSD_TCPIP_STACK__
#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
-#endif
-
-#ifndef __BSD_VISIBLE
-#define __BSD_VISIBLE
-#endif
+#define PPC_HAS_CLASSIC_EXCEPTIONS FALSE
#include <bsp.h>
#include <rtems/bspIo.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 12:45:09 +0000