diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-27 11:12:44 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-31 11:18:17 +0100 |
commit | d8d6a08d4677e6c68fc94b7d182e3af61c3fd76e (patch) | |
tree | b8ef1e0ecaf0792533d9b6aae95c050e83766fe2 /c/src/lib/libbsp/m68k | |
parent | epiphany: Workaround until next Newlib snapshot (diff) | |
download | rtems-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 '')
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/network/network.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/csb360/network/network.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/network/network.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/network/network.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/network/network.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/Makefile.am | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/network/network.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/network/network.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/network/network.c | 2 |
16 files changed, 25 insertions, 69 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index a3d051a365..d9842e1ca2 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -37,20 +37,13 @@ libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += timer/timer.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@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5282/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/m68k/av5282/headers.am diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c index 90c0b4a377..457b43c5d6 100644 --- a/c/src/lib/libbsp/m68k/av5282/network/network.c +++ b/c/src/lib/libbsp/m68k/av5282/network/network.c @@ -1,3 +1,5 @@ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ + #include <bsp.h> #include <stdio.h> #include <errno.h> diff --git a/c/src/lib/libbsp/m68k/csb360/network/network.c b/c/src/lib/libbsp/m68k/csb360/network/network.c index 8abba2a1d8..47e0adb44d 100644 --- a/c/src/lib/libbsp/m68k/csb360/network/network.c +++ b/c/src/lib/libbsp/m68k/csb360/network/network.c @@ -21,6 +21,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 <rtems/error.h> diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 9bb4369caa..1701c1b83d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -39,19 +39,12 @@ libbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c libbsp_a_SOURCES += timer/timer.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@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif if HAS_FPSP libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif diff --git a/c/src/lib/libbsp/m68k/gen68360/network/network.c b/c/src/lib/libbsp/m68k/gen68360/network/network.c index 3ed3bf5590..0a038d3348 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68360/network/network.c @@ -7,6 +7,9 @@ * Saskatoon, Saskatchewan, CANADA * eric@skatter.usask.ca */ + +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ + #include <bsp.h> #include <rtems/m68k/m68360.h> #include <stdio.h> diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index fd9eac00f3..fba06369c9 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -54,20 +54,11 @@ libbsp_a_SOURCES += ../include/cache_.h libbsp_a_CPPFLAGS += -I$(srcdir)/include 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@/shared/misc.rel \ ../../../libcpu/@RTEMS_CPU@/mcf548x/mcdma.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif - include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am diff --git a/c/src/lib/libbsp/m68k/genmcf548x/network/network.c b/c/src/lib/libbsp/m68k/genmcf548x/network/network.c index 62acda5990..13cb5fbdce 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/network/network.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/network/network.c @@ -37,6 +37,8 @@ * */ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ + #include <rtems.h> #include <rtems/error.h> #include <rtems/rtems_bsdnet.h> diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 8a9027883a..adb474f65e 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -39,21 +39,13 @@ libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += timer/timer.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@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5235/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/m68k/mcf5235/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5235/network/network.c b/c/src/lib/libbsp/m68k/mcf5235/network/network.c index 7ce20e0400..6c8fa88be2 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/network/network.c +++ b/c/src/lib/libbsp/m68k/mcf5235/network/network.c @@ -4,6 +4,8 @@ * TO DO: Check network stack code -- force longword alignment of all tx mbufs? */ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ + #include <bsp.h> #include <stdio.h> #include <errno.h> diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index b6527dbe77..b844e949d6 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -38,12 +38,7 @@ libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += timer/timer.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 = \ @@ -51,9 +46,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ ../../../libcpu/@RTEMS_CPU@/mcf532x/cachepd.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif - include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/m68k/mcf5329/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5329/network/network.c b/c/src/lib/libbsp/m68k/mcf5329/network/network.c index 62d90f1219..c752f8d669 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/network/network.c +++ b/c/src/lib/libbsp/m68k/mcf5329/network/network.c @@ -4,6 +4,8 @@ * TO DO: Check network stack code -- force longword alignment of all tx mbufs? */ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ + #include <bsp.h> #include <stdio.h> #include <errno.h> diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 9ecf9f56e0..c5e3b92f99 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -41,19 +41,12 @@ libbsp_a_SOURCES += timer/timer.c timer/timerisr.S libbsp_a_SOURCES += tod/tod.c if HAS_NETWORKING -network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -noinst_PROGRAMS += network.rel -network_rel_SOURCES = ../mvme167/network/network.c -network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) -network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +libbsp_a_SOURCES += ../mvme167/network/network.c endif libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif if HAS_FPSP libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index fdea7cb506..84a227008a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -38,20 +38,13 @@ libbsp_a_SOURCES += console/console.c console/console-recording.h libbsp_a_SOURCES += timer/timer.c timer/timerisr.S 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@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif EXTRA_DIST += times diff --git a/c/src/lib/libbsp/m68k/mvme167/network/network.c b/c/src/lib/libbsp/m68k/mvme167/network/network.c index 822db56730..06bcbfa84a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/network.c +++ b/c/src/lib/libbsp/m68k/mvme167/network/network.c @@ -1,6 +1,7 @@ /* network.c: An 82596 ethernet driver for rtems-bsd. */ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ #define KERNEL /* diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index 5572d3f3dc..870ff61a20 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -36,19 +36,12 @@ libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += timer/timer.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@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5282/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/m68k/uC5282/headers.am diff --git a/c/src/lib/libbsp/m68k/uC5282/network/network.c b/c/src/lib/libbsp/m68k/uC5282/network/network.c index 86a2a50bd1..b8afa0b968 100644 --- a/c/src/lib/libbsp/m68k/uC5282/network/network.c +++ b/c/src/lib/libbsp/m68k/uC5282/network/network.c @@ -11,6 +11,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ + #include <bsp.h> #include <stdio.h> #include <errno.h> |