bsps: Move wd80x3.h to libchip/wd80x3.h

This header is used also by the motorola_powerpc BSP.

Update #3254.

9 files changed, 7 insertions, 19 deletions

diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index fdc192b154..bf6412563f 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -203,14 +203,9 @@ ne2000_rel_LDFLAGS += -Wl,--undefined=rtems_ne_driver_attach
 endif
 
 if HAS_NETWORKING
-# This driver needs to be reworked for the BSD stack.
-# We only install wd80x3.h if HAS_NETWORKING was defined
-include_HEADERS += include/wd80x3.h
-
 wd8003_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 noinst_PROGRAMS += wd8003.rel
 wd8003_rel_SOURCES = wd8003/wd8003.c
-wd8003_rel_SOURCES += include/wd80x3.h
 wd8003_rel_CPPFLAGS = $(AM_CPPFLAGS) $(wd8003_CPPFLAGS)
 wd8003_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 wd8003_rel_LDFLAGS += -Wl,--undefined=rtems_wd_driver_attach
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
index d757e27c92..0b9bdba7ee 100644
--- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
+++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
@@ -28,7 +28,7 @@
  */
 
 #include <bsp.h>
-#include <wd80x3.h>
+#include <libchip/wd80x3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/c/src/lib/libbsp/i386/pc386/preinstall.am b/c/src/lib/libbsp/i386/pc386/preinstall.am
index 3ebe73bb88..7476a70703 100644
--- a/c/src/lib/libbsp/i386/pc386/preinstall.am
+++ b/c/src/lib/libbsp/i386/pc386/preinstall.am
@@ -171,8 +171,3 @@ $(PROJECT_LIB)/appstart.$(OBJEXT): appstart.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/appstart.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/appstart.$(OBJEXT)
 endif
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
-endif
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
index 64b7fda174..1d37f38377 100644
--- a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
+++ b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
@@ -10,7 +10,7 @@
  */
 
 #include <bsp.h>
-#include <wd80x3.h>
+#include <libchip/wd80x3.h>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 6e07723034..8196c9d2af 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -135,7 +135,6 @@ libbsp_a_SOURCES += ../../powerpc/shared/vme/vme_universe.c
 
 if QEMU
 if HAS_NETWORKING
-nodist_include_HEADERS  += $(srcdir)/../../i386/pc386/include/wd80x3.h
 ne2000_CPPFLAGS          = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 ne2000_CPPFLAGS         += '-Dbsp_cmdline_arg=rtems_bsp_cmdline_get_param_raw'
 noinst_PROGRAMS         += ne2000.rel
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
index d8c51daebf..362a026dd6 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
@@ -138,11 +138,6 @@ $(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INC
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
 
 if QEMU
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/wd80x3.h: $(srcdir)/../../i386/pc386/include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
-endif
 endif
 if QEMU
 endif
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index cc7b27fec0..3eab714687 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -35,7 +35,7 @@ noinst_LIBRARIES += libnetchip.a
 libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS)
 libnetchip_a_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 include_libchip_HEADERS += network/cs8900.h network/i82586var.h \
-    network/if_fxpvar.h network/sonic.h
+    network/if_fxpvar.h network/sonic.h network/wd80x3.h
 include_libchip_HEADERS += network/open_eth.h network/if_dcreg.h
 libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \
     network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c \
diff --git a/c/src/lib/libbsp/i386/pc386/include/wd80x3.h b/c/src/libchip/network/wd80x3.h
index b4aa12e735..b4aa12e735 100644
--- a/c/src/lib/libbsp/i386/pc386/include/wd80x3.h
+++ b/c/src/libchip/network/wd80x3.h
diff --git a/c/src/libchip/preinstall.am b/c/src/libchip/preinstall.am
index a280315a41..82bb281633 100644
--- a/c/src/libchip/preinstall.am
+++ b/c/src/libchip/preinstall.am
@@ -78,6 +78,10 @@ $(PROJECT_INCLUDE)/libchip/sonic.h: network/sonic.h $(PROJECT_INCLUDE)/libchip/$
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sonic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sonic.h
 
+$(PROJECT_INCLUDE)/libchip/wd80x3.h: network/wd80x3.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/wd80x3.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/wd80x3.h
+
 $(PROJECT_INCLUDE)/libchip/open_eth.h: network/open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h