bsp/beatnik: Avoid RTEMS_RELLDFLAGS

Avoid extra CPPFLAGS.

c/src/lib/libbsp/powerpc/beatnik/Makefile.am

@@ -82,71 +82,14 @@ librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
 
 #network
 if HAS_NETWORKING
-noinst_PROGRAMS += network_support.rel
-network_support_rel_SOURCES = network/support/early_link_status.c \
-    network/support/bsp_attach.c
-network_support_rel_CPPFLAGS = $(AM_CPPFLAGS)
-network_support_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += network_if_mve_tmp.rel
-network_if_mve_tmp_rel_SOURCES  = network/if_mve/mv643xx_eth.c
-network_if_mve_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) -DDISABLE_DETACHING
-network_if_mve_tmp_rel_CFLAGS   = $(AM_CFLAGS)
-network_if_mve_tmp_rel_LDFLAGS  = $(RTEMS_RELLDFLAGS)
-
-# remove all unneccessary global symbols to avoid name clashes
-# with BSD stuff;
-network_if_mve.rel: network_if_mve_tmp.rel
-	$(OBJCOPY) -G rtems_mve_attach -G rtems_mve_early_link_check_ops \
-                   -G BSP_mve_ack_irqs -G BSP_mve_disable_irqs \
-                   -G BSP_mve_enable_irqs -G BSP_mve_init_hw \
-                   -G BSP_mve_ack_irq_mask -G BSP_mve_disable_irq_mask \
-                   -G BSP_mve_enable_irq_mask -G BSP_mve_setup_1 \
-                   -G BSP_mve_read_eaddr -G BSP_mve_send_buf \
-                   -G BSP_mve_send_buf_raw \
-                   -G BSP_mve_setup -G BSP_mve_stop_hw \
-                   -G BSP_mve_swipe_rx -G BSP_mve_swipe_tx \
-                   -G BSP_mve_detach -G BSP_mve_media_ioctl \
-                   -G BSP_mve_get_tid \
-                   -G BSP_mve_dump_stats -G BSP_mve_ack_link_chg \
-                   -G BSP_mve_mcast_filter_clear \
-                   -G BSP_mve_mcast_filter_accept_all \
-                   -G BSP_mve_mcast_filter_accept_add \
-                   -G BSP_mve_mcast_filter_accept_del \
-                   -G mveth_serial_ctrl_config_val \
-	           $^ $@
-
-noinst_PROGRAMS += network_if_gfe_tmp.rel
-network_if_gfe_tmp_rel_SOURCES = network/if_gfe/if_gfe.c network/if_gfe/if_gfe_rtems.c
-network_if_gfe_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \
-    -I$(srcdir)/network/porting -I$(srcdir)/network/if_gfe
-network_if_gfe_tmp_rel_CFLAGS   = $(AM_CFLAGS)
-network_if_gfe_tmp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# remove all unneccessary global symbols to avoid name clashes
-# with BSD stuff;
-network_if_gfe.rel: network_if_gfe_tmp.rel
-	$(OBJCOPY) -G rtems_gfe_attach -G net_driver_ticks_per_sec \
-                   -G rtems_gfe_setup -G rtems_gfe_early_link_check_ops \
-                   $^ $@
-
-
-noinst_PROGRAMS += network_if_em_tmp.rel
-network_if_em_tmp_rel_SOURCES = network/if_em/if_em.c \
-    network/if_em/if_em_hw.c \
-    network/if_em/if_em_rtems.c
-network_if_em_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \
-    -I$(srcdir)/network/porting -I$(srcdir)/network/if_em
-network_if_em_tmp_rel_CFLAGS   = $(AM_CFLAGS)
-network_if_em_tmp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-network_if_em.rel: network_if_em_tmp.rel
-	$(OBJCOPY) -G rtems_em_attach -G net_driver_ticks_per_sec \
-                   -G rtems_em_pci_setup -G rtems_em_early_link_check_ops \
-                   $^ $@
-
-librtemsbsp_a_LIBADD = network_support.rel \
-    network_if_mve.rel network_if_gfe.rel network_if_em.rel
+librtemsbsp_a_SOURCES += network/if_em/if_em.c
+librtemsbsp_a_SOURCES += network/if_em/if_em_hw.c
+librtemsbsp_a_SOURCES += network/if_em/if_em_rtems.c
+librtemsbsp_a_SOURCES += network/if_gfe/if_gfe.c
+librtemsbsp_a_SOURCES += network/if_gfe/if_gfe_rtems.c
+librtemsbsp_a_SOURCES += network/if_mve/mv643xx_eth.c
+librtemsbsp_a_SOURCES += network/support/bsp_attach.c
+librtemsbsp_a_SOURCES += network/support/early_link_status.c
 endif
 
 # tod

c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c

@@ -36,9 +36,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <dev/em/if_em.h>
 #else
 #include <rtems.h>
-#include <rtemscompat.h>
-#include <if_em.h>
-#include <rtemscompat1.h>
+#include "rtemscompat_defs.h"
+#include "../porting/rtemscompat.h"
+#include "if_em.h"
+#include "../porting/rtemscompat1.h"
 #include <inttypes.h>
 #endif
 

c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.h

@@ -93,7 +93,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <dev/em/if_em_hw.h>
 #else
-#include <if_em_hw.h>
+#include "if_em_hw.h"
 #endif
 
 /* Tunables */

c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.c

@@ -37,8 +37,9 @@
 
 #include <sys/cdefs.h>
 #ifdef __rtems__
-#include <rtemscompat.h>
-#include <if_em_hw.h>
+#include "rtemscompat_defs.h"
+#include "../porting/rtemscompat.h"
+#include "if_em_hw.h"
 #else
 __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/em/if_em_hw.c,v 1.16 2005/05/26 23:32:02 tackerman Exp $");
 

c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.h

@@ -42,7 +42,7 @@
 #ifndef __rtems__
 #include <dev/em/if_em_osdep.h>
 #else
-#include <if_em_osdep.h>
+#include "if_em_osdep.h"
 #endif
 
 

c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_osdep.h

@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define _RTEMS_OS_H_
 
 #include <rtems.h>
-#include <rtemscompat.h>
+#include "../porting/rtemscompat.h"
 
 #include <sys/types.h>
 #include <sys/param.h>

c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_rtems.c

@@ -1,4 +1,5 @@
-#include "if_xxx_rtems.c"
+#include "rtemscompat_defs.h"
+#include "../porting/if_xxx_rtems.c"
 #include <bsp/early_enet_link_status.h>
 #include <bsp/if_em_pub.h>
 

c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h

@@ -40,7 +40,7 @@
  * header, leave this undefined).
  *
  */
-#define  IF_REG_HEADER <if_em.h>
+#define  IF_REG_HEADER "../if_em/if_em.h"
 #undef  IF_VAR_HEADER
 
 /* define if a pci device */
@@ -107,4 +107,92 @@ typedef struct {
 
 #define BUS_DMA_NOWAIT		0xdeadbeef	/* unused */
 
+#define em_adapter_list _bsd_em_adapter_list
+#define em_arc_subsystem_valid _bsd_em_arc_subsystem_valid
+#define em_check_downshift _bsd_em_check_downshift
+#define em_check_for_link _bsd_em_check_for_link
+#define em_check_mng_mode _bsd_em_check_mng_mode
+#define em_check_phy_reset_block _bsd_em_check_phy_reset_block
+#define em_check_polarity _bsd_em_check_polarity
+#define em_cleanup_led _bsd_em_cleanup_led
+#define em_clear_hw_cntrs _bsd_em_clear_hw_cntrs
+#define em_clear_vfta _bsd_em_clear_vfta
+#define em_commit_shadow_ram _bsd_em_commit_shadow_ram
+#define em_config_collision_dist _bsd_em_config_collision_dist
+#define em_config_dsp_after_link_change _bsd_em_config_dsp_after_link_change
+#define em_config_fc_after_link_up _bsd_em_config_fc_after_link_up
+#define em_dbg_config _bsd_em_dbg_config
+#define em_detect_gig_phy _bsd_em_detect_gig_phy
+#define em_disable_pciex_master _bsd_em_disable_pciex_master
+#define em_display_debug_stats _bsd_em_display_debug_stats
+#define em_driver_version _bsd_em_driver_version
+#define em_enable_mng_pass_thru _bsd_em_enable_mng_pass_thru
+#define em_enable_pciex_master _bsd_em_enable_pciex_master
+#define em_enable_tx_pkt_filtering _bsd_em_enable_tx_pkt_filtering
+#define em_force_mac_fc _bsd_em_force_mac_fc
+#define em_get_auto_rd_done _bsd_em_get_auto_rd_done
+#define em_get_bus_info _bsd_em_get_bus_info
+#define em_get_cable_length _bsd_em_get_cable_length
+#define em_get_hw_eeprom_semaphore _bsd_em_get_hw_eeprom_semaphore
+#define em_get_phy_cfg_done _bsd_em_get_phy_cfg_done
+#define em_get_speed_and_duplex _bsd_em_get_speed_and_duplex
+#define em_hash_mc_addr _bsd_em_hash_mc_addr
+#define em_hw_early_init _bsd_em_hw_early_init
+#define em_id_led_init _bsd_em_id_led_init
+#define em_init_eeprom_params _bsd_em_init_eeprom_params
+#define em_init_hw _bsd_em_init_hw
+#define em_init_rx_addrs _bsd_em_init_rx_addrs
+#define em_io_read _bsd_em_io_read
+#define em_io_write _bsd_em_io_write
+#define em_is_onboard_nvm_eeprom _bsd_em_is_onboard_nvm_eeprom
+#define em_led_off _bsd_em_led_off
+#define em_led_on _bsd_em_led_on
+#define em_mc_addr_list_update _bsd_em_mc_addr_list_update
+#define em_mng_enable_host_if _bsd_em_mng_enable_host_if
+#define em_mng_host_if_write _bsd_em_mng_host_if_write
+#define em_mng_write_cmd_header _bsd_em_mng_write_cmd_header
+#define em_mng_write_commit _bsd_em_mng_write_commit
+#define em_mng_write_dhcp_info _bsd_em_mng_write_dhcp_info
+#define em_mta_set _bsd_em_mta_set
+#define em_pci_clear_mwi _bsd_em_pci_clear_mwi
+#define em_pci_set_mwi _bsd_em_pci_set_mwi
+#define em_phy_get_info _bsd_em_phy_get_info
+#define em_phy_hw_reset _bsd_em_phy_hw_reset
+#define em_phy_igp_get_info _bsd_em_phy_igp_get_info
+#define em_phy_m88_get_info _bsd_em_phy_m88_get_info
+#define em_phy_reset _bsd_em_phy_reset
+#define em_phy_setup_autoneg _bsd_em_phy_setup_autoneg
+#define em_poll_eerd_eewr_done _bsd_em_poll_eerd_eewr_done
+#define em_put_hw_eeprom_semaphore _bsd_em_put_hw_eeprom_semaphore
+#define em_rar_set _bsd_em_rar_set
+#define em_read_eeprom _bsd_em_read_eeprom
+#define em_read_eeprom_eerd _bsd_em_read_eeprom_eerd
+#define em_read_mac_addr _bsd_em_read_mac_addr
+#define em_read_part_num _bsd_em_read_part_num
+#define em_read_pci_cfg _bsd_em_read_pci_cfg
+#define em_read_phy_reg _bsd_em_read_phy_reg
+#define em_read_reg_io _bsd_em_read_reg_io
+#define em_reset_adaptive _bsd_em_reset_adaptive
+#define em_reset_hw _bsd_em_reset_hw
+#define em_set_d0_lplu_state _bsd_em_set_d0_lplu_state
+#define em_set_d3_lplu_state _bsd_em_set_d3_lplu_state
+#define em_set_mac_type _bsd_em_set_mac_type
+#define em_set_media_type _bsd_em_set_media_type
+#define em_set_pci_express_master_disable _bsd_em_set_pci_express_master_disable
+#define em_setup_led _bsd_em_setup_led
+#define em_setup_link _bsd_em_setup_link
+#define em_tbi_adjust_stats _bsd_em_tbi_adjust_stats
+#define em_update_adaptive _bsd_em_update_adaptive
+#define em_update_eeprom_checksum _bsd_em_update_eeprom_checksum
+#define em_validate_eeprom_checksum _bsd_em_validate_eeprom_checksum
+#define em_validate_mdi_setting _bsd_em_validate_mdi_setting
+#define em_wait_autoneg _bsd_em_wait_autoneg
+#define em_write_eeprom _bsd_em_write_eeprom
+#define em_write_eeprom_eewr _bsd_em_write_eeprom_eewr
+#define em_write_pci_cfg _bsd_em_write_pci_cfg
+#define em_write_phy_reg _bsd_em_write_phy_reg
+#define em_write_reg_io _bsd_em_write_reg_io
+#define em_write_vfta _bsd_em_write_vfta
+#define the_em_devs _bsd_the_em_devs
+
 #endif

c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c

@@ -48,7 +48,8 @@
  */
 
 #ifdef __rtems__
-#include <rtemscompat.h>
+#include "rtemscompat_defs.h"
+#include "../porting/rtemscompat.h"
 #include <string.h>
 #include <stdio.h>
 #include <inttypes.h>
@@ -121,7 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.13.8.1 2005/04/29 11:28:56 kent Exp $")
 
 #include	"gtvar.h"
 #include	"if_gfevar.h"
-#include 	<rtemscompat1.h>
+#include 	"../porting/rtemscompat1.h"
 #define		ether_sprintf ether_sprintf_macro
 #endif
 

c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_rtems.c

@@ -1,5 +1,6 @@
 /* Author: T. Straumann <strauman@slac.stanford.edu>; see ../../LICENSE */
-#include "rtemscompat.h"
+#include "rtemscompat_defs.h"
+#include "../porting/rtemscompat.h"
 #include "gtethreg.h"
 
 #include <bsp/early_enet_link_status.h>
@@ -17,7 +18,7 @@
 #define	GT_WRITE(sc, reg, v) \
 	bus_space_write_4((sc)->sc_gt_memt, (sc)->sc_gt_memh, reg, (v))
 
-#include "if_xxx_rtems.c"
+#include "../porting/if_xxx_rtems.c"
 
 #include <bsp.h>
 #include <libcpu/io.h>

c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h

@@ -1,6 +1,9 @@
 #ifndef RTEMS_COMPAT_DEFS_H
 #define RTEMS_COMPAT_DEFS_H
 
+#include <stdint.h>
+#include <stddef.h>
+
 /* Number of device instances the driver should support
  * - may be limited to 1 depending on IRQ API
  * (braindamaged PC586 and powerpc)
@@ -37,7 +40,7 @@
  *
  */
 #undef  IF_REG_HEADER
-#define  IF_VAR_HEADER <if_gfevar.h>
+#define  IF_VAR_HEADER "../if_gfe/if_gfevar.h"
 
 /* define if a pci device */
 /*
@@ -119,4 +122,40 @@ int snprintf(char *, size_t, const char *,...);
 #define delay(arg)	DELAY(arg)
 
 #define KASSERT(a...) do {} while (0)
+
+#define gfe_assign_desc _bsd_gfe_assign_desc
+#define gfe_attach _bsd_gfe_attach
+#define gfe_dbg_config _bsd_gfe_dbg_config
+#define gfe_dmamem_alloc _bsd_gfe_dmamem_alloc
+#define gfe_dmamem_free _bsd_gfe_dmamem_free
+#define gfe_hash_alloc _bsd_gfe_hash_alloc
+#define gfe_hash_compute _bsd_gfe_hash_compute
+#define gfe_hash_entry_op _bsd_gfe_hash_entry_op
+#define gfe_hash_fill _bsd_gfe_hash_fill
+#define gfe_ifioctl _bsd_gfe_ifioctl
+#define gfe_ifstart _bsd_gfe_ifstart
+#define gfe_ifwatchdog _bsd_gfe_ifwatchdog
+#define gfe_init _bsd_gfe_init
+#define gfe_intr _bsd_gfe_intr
+#define gfe_mdio_access _bsd_gfe_mdio_access
+#define gfe_mii_read _bsd_gfe_mii_read
+#define gfe_mii_write _bsd_gfe_mii_write
+#define gfe_probe _bsd_gfe_probe
+#define gfe_rx_cleanup _bsd_gfe_rx_cleanup
+#define gfe_rx_get _bsd_gfe_rx_get
+#define gfe_rx_prime _bsd_gfe_rx_prime
+#define gfe_rx_process _bsd_gfe_rx_process
+#define gfe_rx_rxqalloc _bsd_gfe_rx_rxqalloc
+#define gfe_rx_rxqinit _bsd_gfe_rx_rxqinit
+#define gfe_rx_stop _bsd_gfe_rx_stop
+#define gfe_tick _bsd_gfe_tick
+#define gfe_tx_cleanup _bsd_gfe_tx_cleanup
+#define gfe_tx_done _bsd_gfe_tx_done
+#define gfe_tx_enqueue _bsd_gfe_tx_enqueue
+#define gfe_tx_start _bsd_gfe_tx_start
+#define gfe_tx_stop _bsd_gfe_tx_stop
+#define gfe_tx_txqalloc _bsd_gfe_tx_txqalloc
+#define gfe_whack _bsd_gfe_whack
+#define the_gfe_devs _bsd_the_gfe_devs
+
 #endif

c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c

@@ -90,7 +90,11 @@
 #include <libcpu/byteorder.h>
 
 #include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
 #include <dev/mii/mii.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 /* Not so nice; would be more elegant not to depend on C library but the
@@ -138,13 +142,11 @@
 /* Enable debugging messages and some support routines  (dump rings etc.)                    */      
 #undef  MVETH_DEBUG
 
-#ifndef DISABLE_DETACHING	/* can override from Makefile */
 /* Hack for driver development; rtems bsdnet doesn't implement detaching an interface :-(
  * but this hack allows us to unload/reload the driver module which makes development
  * a lot less painful.
  */
-#define MVETH_DETACH_HACK
-#endif
+#undef MVETH_DETACH_HACK
 
 /* Ring sizes */
 

c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c

@@ -1,4 +1,4 @@
-#include <rtemscompat.h>
+#include "rtemscompat.h"
 
 /* Template for driver task, setup and attach routines. To be instantiated
  * by defining the relevant symbols in header files.
@@ -37,7 +37,7 @@
 #include IF_VAR_HEADER
 #endif
 
-#include <rtemscompat1.h>
+#include "rtemscompat1.h"
 
 #define EX_EVENT RTEMS_EVENT_1
 #undef  IRQ_AT_8259

c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat.h

@@ -49,8 +49,6 @@ static inline void  the_real_free(void *p)
 #endif
 #include <rtems/bspIo.h>
 
-#include "rtemscompat_defs.h"
-
 #define NET_EMB(x,y,z) x ## y ## z
 #define NET_EMBEMB(x,y,z) NET_EMB(x,y,z)
 

c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat1.h

@@ -110,7 +110,7 @@ device_is_attached(netdev_t *dev)
 
 #ifdef NETDRIVER_PCI
 #include NETDRIVER_PCI
-#include <pcireg.h>
+#include "pcireg.h"
 
 static inline unsigned
 pci_read_config(device_t dev, unsigned addr, unsigned width)