RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
This header is used also by the motorola_powerpc BSP.

Update #3254.
This commit is contained in:
Sebastian Huber
2018-01-12 07:56:42 +01:00
parent 168277e759
commit 17fd0ff0cd
9 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/i386/pc386/Makefile.am
View File

@@ -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

2
c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
View File

@@ -28,7 +28,7 @@
*/
#include <bsp.h>
#include <wd80x3.h>
#include <libchip/wd80x3.h>
#include <stdio.h>
#include <stdlib.h>

5
c/src/lib/libbsp/i386/pc386/preinstall.am
View File

@@ -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

2
c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
View File

@@ -10,7 +10,7 @@
*/
#include <bsp.h>
#include <wd80x3.h>
#include <libchip/wd80x3.h>
#include <stdio.h>
#include <stdarg.h>

1
c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
View File

@@ -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

5
c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
View File

@@ -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

2
c/src/libchip/Makefile.am
View File

@@ -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 \

0
c/src/lib/libbsp/i386/pc386/include/wd80x3.h → c/src/libchip/network/wd80x3.h
View File

4
c/src/libchip/preinstall.am
View File

@@ -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