Changeset efb893f in rtems


Ignore:
Timestamp:
Apr 7, 2018, 5:28:42 PM (23 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
b46f943c
Parents:
b43ea9f
git-author:
Sebastian Huber <sebastian.huber@…> (04/07/18 17:28:42)
git-committer:
Sebastian Huber <sebastian.huber@…> (04/12/18 05:09:10)
Message:

bsp/beatnik: Avoid RTEMS_RELLDFLAGS

Avoid extra CPPFLAGS.

Location:
c/src/lib/libbsp/powerpc/beatnik
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/beatnik/Makefile.am

    rb43ea9f refb893f  
    8383#network
    8484if HAS_NETWORKING
    85 noinst_PROGRAMS += network_support.rel
    86 network_support_rel_SOURCES = network/support/early_link_status.c \
    87     network/support/bsp_attach.c
    88 network_support_rel_CPPFLAGS = $(AM_CPPFLAGS)
    89 network_support_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    90 
    91 noinst_PROGRAMS += network_if_mve_tmp.rel
    92 network_if_mve_tmp_rel_SOURCES  = network/if_mve/mv643xx_eth.c
    93 network_if_mve_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) -DDISABLE_DETACHING
    94 network_if_mve_tmp_rel_CFLAGS   = $(AM_CFLAGS)
    95 network_if_mve_tmp_rel_LDFLAGS  = $(RTEMS_RELLDFLAGS)
    96 
    97 # remove all unneccessary global symbols to avoid name clashes
    98 # with BSD stuff;
    99 network_if_mve.rel: network_if_mve_tmp.rel
    100         $(OBJCOPY) -G rtems_mve_attach -G rtems_mve_early_link_check_ops \
    101                    -G BSP_mve_ack_irqs -G BSP_mve_disable_irqs \
    102                    -G BSP_mve_enable_irqs -G BSP_mve_init_hw \
    103                    -G BSP_mve_ack_irq_mask -G BSP_mve_disable_irq_mask \
    104                    -G BSP_mve_enable_irq_mask -G BSP_mve_setup_1 \
    105                    -G BSP_mve_read_eaddr -G BSP_mve_send_buf \
    106                    -G BSP_mve_send_buf_raw \
    107                    -G BSP_mve_setup -G BSP_mve_stop_hw \
    108                    -G BSP_mve_swipe_rx -G BSP_mve_swipe_tx \
    109                    -G BSP_mve_detach -G BSP_mve_media_ioctl \
    110                    -G BSP_mve_get_tid \
    111                    -G BSP_mve_dump_stats -G BSP_mve_ack_link_chg \
    112                    -G BSP_mve_mcast_filter_clear \
    113                    -G BSP_mve_mcast_filter_accept_all \
    114                    -G BSP_mve_mcast_filter_accept_add \
    115                    -G BSP_mve_mcast_filter_accept_del \
    116                    -G mveth_serial_ctrl_config_val \
    117                    $^ $@
    118 
    119 noinst_PROGRAMS += network_if_gfe_tmp.rel
    120 network_if_gfe_tmp_rel_SOURCES = network/if_gfe/if_gfe.c network/if_gfe/if_gfe_rtems.c
    121 network_if_gfe_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \
    122     -I$(srcdir)/network/porting -I$(srcdir)/network/if_gfe
    123 network_if_gfe_tmp_rel_CFLAGS   = $(AM_CFLAGS)
    124 network_if_gfe_tmp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    125 
    126 # remove all unneccessary global symbols to avoid name clashes
    127 # with BSD stuff;
    128 network_if_gfe.rel: network_if_gfe_tmp.rel
    129         $(OBJCOPY) -G rtems_gfe_attach -G net_driver_ticks_per_sec \
    130                    -G rtems_gfe_setup -G rtems_gfe_early_link_check_ops \
    131                    $^ $@
    132 
    133 
    134 noinst_PROGRAMS += network_if_em_tmp.rel
    135 network_if_em_tmp_rel_SOURCES = network/if_em/if_em.c \
    136     network/if_em/if_em_hw.c \
    137     network/if_em/if_em_rtems.c
    138 network_if_em_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \
    139     -I$(srcdir)/network/porting -I$(srcdir)/network/if_em
    140 network_if_em_tmp_rel_CFLAGS   = $(AM_CFLAGS)
    141 network_if_em_tmp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    142 
    143 network_if_em.rel: network_if_em_tmp.rel
    144         $(OBJCOPY) -G rtems_em_attach -G net_driver_ticks_per_sec \
    145                    -G rtems_em_pci_setup -G rtems_em_early_link_check_ops \
    146                    $^ $@
    147 
    148 librtemsbsp_a_LIBADD = network_support.rel \
    149     network_if_mve.rel network_if_gfe.rel network_if_em.rel
     85librtemsbsp_a_SOURCES += network/if_em/if_em.c
     86librtemsbsp_a_SOURCES += network/if_em/if_em_hw.c
     87librtemsbsp_a_SOURCES += network/if_em/if_em_rtems.c
     88librtemsbsp_a_SOURCES += network/if_gfe/if_gfe.c
     89librtemsbsp_a_SOURCES += network/if_gfe/if_gfe_rtems.c
     90librtemsbsp_a_SOURCES += network/if_mve/mv643xx_eth.c
     91librtemsbsp_a_SOURCES += network/support/bsp_attach.c
     92librtemsbsp_a_SOURCES += network/support/early_link_status.c
    15093endif
    15194
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c

    rb43ea9f refb893f  
    3737#else
    3838#include <rtems.h>
    39 #include <rtemscompat.h>
    40 #include <if_em.h>
    41 #include <rtemscompat1.h>
     39#include "rtemscompat_defs.h"
     40#include "../porting/rtemscompat.h"
     41#include "if_em.h"
     42#include "../porting/rtemscompat1.h"
    4243#include <inttypes.h>
    4344#endif
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.h

    rb43ea9f refb893f  
    9494#include <dev/em/if_em_hw.h>
    9595#else
    96 #include <if_em_hw.h>
     96#include "if_em_hw.h"
    9797#endif
    9898
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.c

    rb43ea9f refb893f  
    3838#include <sys/cdefs.h>
    3939#ifdef __rtems__
    40 #include <rtemscompat.h>
    41 #include <if_em_hw.h>
     40#include "rtemscompat_defs.h"
     41#include "../porting/rtemscompat.h"
     42#include "if_em_hw.h"
    4243#else
    4344__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

    rb43ea9f refb893f  
    4343#include <dev/em/if_em_osdep.h>
    4444#else
    45 #include <if_em_osdep.h>
     45#include "if_em_osdep.h"
    4646#endif
    4747
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_osdep.h

    rb43ea9f refb893f  
    3838
    3939#include <rtems.h>
    40 #include <rtemscompat.h>
     40#include "../porting/rtemscompat.h"
    4141
    4242#include <sys/types.h>
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_rtems.c

    rb43ea9f refb893f  
    1 #include "if_xxx_rtems.c"
     1#include "rtemscompat_defs.h"
     2#include "../porting/if_xxx_rtems.c"
    23#include <bsp/early_enet_link_status.h>
    34#include <bsp/if_em_pub.h>
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h

    rb43ea9f refb893f  
    4141 *
    4242 */
    43 #define  IF_REG_HEADER <if_em.h>
     43#define  IF_REG_HEADER "../if_em/if_em.h"
    4444#undef  IF_VAR_HEADER
    4545
     
    108108#define BUS_DMA_NOWAIT          0xdeadbeef      /* unused */
    109109
     110#define em_adapter_list _bsd_em_adapter_list
     111#define em_arc_subsystem_valid _bsd_em_arc_subsystem_valid
     112#define em_check_downshift _bsd_em_check_downshift
     113#define em_check_for_link _bsd_em_check_for_link
     114#define em_check_mng_mode _bsd_em_check_mng_mode
     115#define em_check_phy_reset_block _bsd_em_check_phy_reset_block
     116#define em_check_polarity _bsd_em_check_polarity
     117#define em_cleanup_led _bsd_em_cleanup_led
     118#define em_clear_hw_cntrs _bsd_em_clear_hw_cntrs
     119#define em_clear_vfta _bsd_em_clear_vfta
     120#define em_commit_shadow_ram _bsd_em_commit_shadow_ram
     121#define em_config_collision_dist _bsd_em_config_collision_dist
     122#define em_config_dsp_after_link_change _bsd_em_config_dsp_after_link_change
     123#define em_config_fc_after_link_up _bsd_em_config_fc_after_link_up
     124#define em_dbg_config _bsd_em_dbg_config
     125#define em_detect_gig_phy _bsd_em_detect_gig_phy
     126#define em_disable_pciex_master _bsd_em_disable_pciex_master
     127#define em_display_debug_stats _bsd_em_display_debug_stats
     128#define em_driver_version _bsd_em_driver_version
     129#define em_enable_mng_pass_thru _bsd_em_enable_mng_pass_thru
     130#define em_enable_pciex_master _bsd_em_enable_pciex_master
     131#define em_enable_tx_pkt_filtering _bsd_em_enable_tx_pkt_filtering
     132#define em_force_mac_fc _bsd_em_force_mac_fc
     133#define em_get_auto_rd_done _bsd_em_get_auto_rd_done
     134#define em_get_bus_info _bsd_em_get_bus_info
     135#define em_get_cable_length _bsd_em_get_cable_length
     136#define em_get_hw_eeprom_semaphore _bsd_em_get_hw_eeprom_semaphore
     137#define em_get_phy_cfg_done _bsd_em_get_phy_cfg_done
     138#define em_get_speed_and_duplex _bsd_em_get_speed_and_duplex
     139#define em_hash_mc_addr _bsd_em_hash_mc_addr
     140#define em_hw_early_init _bsd_em_hw_early_init
     141#define em_id_led_init _bsd_em_id_led_init
     142#define em_init_eeprom_params _bsd_em_init_eeprom_params
     143#define em_init_hw _bsd_em_init_hw
     144#define em_init_rx_addrs _bsd_em_init_rx_addrs
     145#define em_io_read _bsd_em_io_read
     146#define em_io_write _bsd_em_io_write
     147#define em_is_onboard_nvm_eeprom _bsd_em_is_onboard_nvm_eeprom
     148#define em_led_off _bsd_em_led_off
     149#define em_led_on _bsd_em_led_on
     150#define em_mc_addr_list_update _bsd_em_mc_addr_list_update
     151#define em_mng_enable_host_if _bsd_em_mng_enable_host_if
     152#define em_mng_host_if_write _bsd_em_mng_host_if_write
     153#define em_mng_write_cmd_header _bsd_em_mng_write_cmd_header
     154#define em_mng_write_commit _bsd_em_mng_write_commit
     155#define em_mng_write_dhcp_info _bsd_em_mng_write_dhcp_info
     156#define em_mta_set _bsd_em_mta_set
     157#define em_pci_clear_mwi _bsd_em_pci_clear_mwi
     158#define em_pci_set_mwi _bsd_em_pci_set_mwi
     159#define em_phy_get_info _bsd_em_phy_get_info
     160#define em_phy_hw_reset _bsd_em_phy_hw_reset
     161#define em_phy_igp_get_info _bsd_em_phy_igp_get_info
     162#define em_phy_m88_get_info _bsd_em_phy_m88_get_info
     163#define em_phy_reset _bsd_em_phy_reset
     164#define em_phy_setup_autoneg _bsd_em_phy_setup_autoneg
     165#define em_poll_eerd_eewr_done _bsd_em_poll_eerd_eewr_done
     166#define em_put_hw_eeprom_semaphore _bsd_em_put_hw_eeprom_semaphore
     167#define em_rar_set _bsd_em_rar_set
     168#define em_read_eeprom _bsd_em_read_eeprom
     169#define em_read_eeprom_eerd _bsd_em_read_eeprom_eerd
     170#define em_read_mac_addr _bsd_em_read_mac_addr
     171#define em_read_part_num _bsd_em_read_part_num
     172#define em_read_pci_cfg _bsd_em_read_pci_cfg
     173#define em_read_phy_reg _bsd_em_read_phy_reg
     174#define em_read_reg_io _bsd_em_read_reg_io
     175#define em_reset_adaptive _bsd_em_reset_adaptive
     176#define em_reset_hw _bsd_em_reset_hw
     177#define em_set_d0_lplu_state _bsd_em_set_d0_lplu_state
     178#define em_set_d3_lplu_state _bsd_em_set_d3_lplu_state
     179#define em_set_mac_type _bsd_em_set_mac_type
     180#define em_set_media_type _bsd_em_set_media_type
     181#define em_set_pci_express_master_disable _bsd_em_set_pci_express_master_disable
     182#define em_setup_led _bsd_em_setup_led
     183#define em_setup_link _bsd_em_setup_link
     184#define em_tbi_adjust_stats _bsd_em_tbi_adjust_stats
     185#define em_update_adaptive _bsd_em_update_adaptive
     186#define em_update_eeprom_checksum _bsd_em_update_eeprom_checksum
     187#define em_validate_eeprom_checksum _bsd_em_validate_eeprom_checksum
     188#define em_validate_mdi_setting _bsd_em_validate_mdi_setting
     189#define em_wait_autoneg _bsd_em_wait_autoneg
     190#define em_write_eeprom _bsd_em_write_eeprom
     191#define em_write_eeprom_eewr _bsd_em_write_eeprom_eewr
     192#define em_write_pci_cfg _bsd_em_write_pci_cfg
     193#define em_write_phy_reg _bsd_em_write_phy_reg
     194#define em_write_reg_io _bsd_em_write_reg_io
     195#define em_write_vfta _bsd_em_write_vfta
     196#define the_em_devs _bsd_the_em_devs
     197
    110198#endif
  • c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c

    rb43ea9f refb893f  
    4949
    5050#ifdef __rtems__
    51 #include <rtemscompat.h>
     51#include "rtemscompat_defs.h"
     52#include "../porting/rtemscompat.h"
    5253#include <string.h>
    5354#include <stdio.h>
     
    122123#include        "gtvar.h"
    123124#include        "if_gfevar.h"
    124 #include        <rtemscompat1.h>
     125#include        "../porting/rtemscompat1.h"
    125126#define         ether_sprintf ether_sprintf_macro
    126127#endif
  • c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_rtems.c

    rb43ea9f refb893f  
    11/* Author: T. Straumann <strauman@slac.stanford.edu>; see ../../LICENSE */
    2 #include "rtemscompat.h"
     2#include "rtemscompat_defs.h"
     3#include "../porting/rtemscompat.h"
    34#include "gtethreg.h"
    45
     
    1819        bus_space_write_4((sc)->sc_gt_memt, (sc)->sc_gt_memh, reg, (v))
    1920
    20 #include "if_xxx_rtems.c"
     21#include "../porting/if_xxx_rtems.c"
    2122
    2223#include <bsp.h>
  • c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h

    rb43ea9f refb893f  
    11#ifndef RTEMS_COMPAT_DEFS_H
    22#define RTEMS_COMPAT_DEFS_H
     3
     4#include <stdint.h>
     5#include <stddef.h>
    36
    47/* Number of device instances the driver should support
     
    3841 */
    3942#undef  IF_REG_HEADER
    40 #define  IF_VAR_HEADER <if_gfevar.h>
     43#define  IF_VAR_HEADER "../if_gfe/if_gfevar.h"
    4144
    4245/* define if a pci device */
     
    120123
    121124#define KASSERT(a...) do {} while (0)
     125
     126#define gfe_assign_desc _bsd_gfe_assign_desc
     127#define gfe_attach _bsd_gfe_attach
     128#define gfe_dbg_config _bsd_gfe_dbg_config
     129#define gfe_dmamem_alloc _bsd_gfe_dmamem_alloc
     130#define gfe_dmamem_free _bsd_gfe_dmamem_free
     131#define gfe_hash_alloc _bsd_gfe_hash_alloc
     132#define gfe_hash_compute _bsd_gfe_hash_compute
     133#define gfe_hash_entry_op _bsd_gfe_hash_entry_op
     134#define gfe_hash_fill _bsd_gfe_hash_fill
     135#define gfe_ifioctl _bsd_gfe_ifioctl
     136#define gfe_ifstart _bsd_gfe_ifstart
     137#define gfe_ifwatchdog _bsd_gfe_ifwatchdog
     138#define gfe_init _bsd_gfe_init
     139#define gfe_intr _bsd_gfe_intr
     140#define gfe_mdio_access _bsd_gfe_mdio_access
     141#define gfe_mii_read _bsd_gfe_mii_read
     142#define gfe_mii_write _bsd_gfe_mii_write
     143#define gfe_probe _bsd_gfe_probe
     144#define gfe_rx_cleanup _bsd_gfe_rx_cleanup
     145#define gfe_rx_get _bsd_gfe_rx_get
     146#define gfe_rx_prime _bsd_gfe_rx_prime
     147#define gfe_rx_process _bsd_gfe_rx_process
     148#define gfe_rx_rxqalloc _bsd_gfe_rx_rxqalloc
     149#define gfe_rx_rxqinit _bsd_gfe_rx_rxqinit
     150#define gfe_rx_stop _bsd_gfe_rx_stop
     151#define gfe_tick _bsd_gfe_tick
     152#define gfe_tx_cleanup _bsd_gfe_tx_cleanup
     153#define gfe_tx_done _bsd_gfe_tx_done
     154#define gfe_tx_enqueue _bsd_gfe_tx_enqueue
     155#define gfe_tx_start _bsd_gfe_tx_start
     156#define gfe_tx_stop _bsd_gfe_tx_stop
     157#define gfe_tx_txqalloc _bsd_gfe_tx_txqalloc
     158#define gfe_whack _bsd_gfe_whack
     159#define the_gfe_devs _bsd_the_gfe_devs
     160
    122161#endif
  • c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c

    rb43ea9f refb893f  
    9191
    9292#include <sys/param.h>
     93#include <sys/proc.h>
     94#include <sys/socket.h>
     95#include <sys/sockio.h>
    9396#include <dev/mii/mii.h>
     97#include <net/if_var.h>
    9498#include <net/if_media.h>
    9599
     
    139143#undef  MVETH_DEBUG
    140144
    141 #ifndef DISABLE_DETACHING       /* can override from Makefile */
    142145/* Hack for driver development; rtems bsdnet doesn't implement detaching an interface :-(
    143146 * but this hack allows us to unload/reload the driver module which makes development
    144147 * a lot less painful.
    145148 */
    146 #define MVETH_DETACH_HACK
    147 #endif
     149#undef MVETH_DETACH_HACK
    148150
    149151/* Ring sizes */
  • c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c

    rb43ea9f refb893f  
    1 #include <rtemscompat.h>
     1#include "rtemscompat.h"
    22
    33/* Template for driver task, setup and attach routines. To be instantiated
     
    3838#endif
    3939
    40 #include <rtemscompat1.h>
     40#include "rtemscompat1.h"
    4141
    4242#define EX_EVENT RTEMS_EVENT_1
  • c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat.h

    rb43ea9f refb893f  
    4949#endif
    5050#include <rtems/bspIo.h>
    51 
    52 #include "rtemscompat_defs.h"
    5351
    5452#define NET_EMB(x,y,z) x ## y ## z
  • c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat1.h

    rb43ea9f refb893f  
    111111#ifdef NETDRIVER_PCI
    112112#include NETDRIVER_PCI
    113 #include <pcireg.h>
     113#include "pcireg.h"
    114114
    115115static inline unsigned
Note: See TracChangeset for help on using the changeset viewer.