[PATCH 05/12] bsp/mvme5500: Avoid RTEMS_RELLDFLAGS

[Sebastian Huber]

---
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am             | 10 +++-------
 .../powerpc/mvme5500/network/if_100MHz/GT64260eth.c       | 13 ++++++-------
 c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c | 15 +++++----------
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 15ae575173..8df589780e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -52,13 +52,9 @@ librtemsbsp_a_SOURCES += vectors/exceptionhandler.c \
 librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
 
 if HAS_NETWORKING
-network_CPPFLAGS = -D_KERNEL -D__BSD_VISIBLE
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/if_100MHz/GT64260eth.c \
-    network/if_1GHz/if_wm.c network/if_1GHz/pci_map.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-librtemsbsp_a_LIBADD = network.rel
+librtemsbsp_a_SOURCES += network/if_100MHz/GT64260eth.c
+librtemsbsp_a_SOURCES += network/if_1GHz/if_wm.c
+librtemsbsp_a_SOURCES += network/if_1GHz/pci_map.c
 endif
 
 rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
index 85d5d0c56a..fa1d9471dd 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
@@ -18,12 +18,16 @@
  * 3) Added S/W support for multi mbuf.  (TODO : Let the H/W do it)
  *
  */
-#define BYTE_ORDER BIG_ENDIAN
 
-#define INET
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
+#define BYTE_ORDER BIG_ENDIAN
 
 #include <rtems.h>
 #include <rtems/bspIo.h>	    /* printk */
+#include <rtems/error.h>
+#include <rtems/rtems_bsdnet.h>
+#include <rtems/rtems_bsdnet_internal.h>
 #include <stdio.h>		    /* printf for statistics */
 #include <string.h>
 
@@ -35,13 +39,8 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <rtems/rtems_bsdnet.h>
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/error.h>
 #include <errno.h>
 
-#include <rtems/rtems/types.h>
-
 /* #include <sys/queue.h> */
 
 #include <sys/socket.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
index 50cd633d69..dc89399b6c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
@@ -30,14 +30,15 @@
  *
  */
 
-#define BYTE_ORDER BIG_ENDIAN
-
-#define INET
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
 
-/*#define RTEMS_ETHERMTU_JUMBO*/
+#define BYTE_ORDER BIG_ENDIAN
 
 #include <rtems.h>
 #include <rtems/bspIo.h>      /* printk */
+#include <rtems/error.h>
+#include <rtems/rtems_bsdnet.h>
+#include <rtems/rtems_bsdnet_internal.h>
 
 #include <inttypes.h>
 #include <stdio.h>	      /* printf for statistics */
@@ -51,14 +52,8 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <rtems/rtems_bsdnet.h>
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/error.h>
 #include <errno.h>
 
-#include <rtems/rtems/types.h>
-#include <rtems/score/cpu.h>
-
 /* #include <sys/queue.h> */
 
 #include <sys/socket.h>
-- 
2.12.3