wrc_core: solved merge conflicts
Showing
- ip_cores/etherbone-core 1 addition, 1 deletionip_cores/etherbone-core
- ip_cores/general-cores 1 addition, 1 deletionip_cores/general-cores
- ip_cores/gn4124-core 1 addition, 1 deletionip_cores/gn4124-core
- ip_cores/vme64x-core 1 addition, 1 deletionip_cores/vme64x-core
- modules/fabric/xwrf_loopback/xwrf_loopback.vhd 1 addition, 1 deletionmodules/fabric/xwrf_loopback/xwrf_loopback.vhd
- modules/wr_endpoint/wr_endpoint.vhd 1 addition, 2 deletionsmodules/wr_endpoint/wr_endpoint.vhd
- modules/wr_endpoint/xwr_endpoint.vhd 1 addition, 2 deletionsmodules/wr_endpoint/xwr_endpoint.vhd
- modules/wr_mini_nic/wr_mini_nic.vhd 8 additions, 4 deletionsmodules/wr_mini_nic/wr_mini_nic.vhd
- modules/wr_mini_nic/xwr_mini_nic.vhd 10 additions, 4 deletionsmodules/wr_mini_nic/xwr_mini_nic.vhd
- modules/wr_pps_gen/wr_pps_gen.vhd 1 addition, 2 deletionsmodules/wr_pps_gen/wr_pps_gen.vhd
- modules/wr_pps_gen/xwr_pps_gen.vhd 1 addition, 2 deletionsmodules/wr_pps_gen/xwr_pps_gen.vhd
- modules/wr_softpll_ng/xwr_softpll_ng.vhd 5 additions, 3 deletionsmodules/wr_softpll_ng/xwr_softpll_ng.vhd
- modules/wr_tlu/tlu.vhd 0 additions, 1 deletionmodules/wr_tlu/tlu.vhd
- modules/wrc_core/wr_core.vhd 0 additions, 3 deletionsmodules/wrc_core/wr_core.vhd
- modules/wrc_core/wrc_periph.vhd 1 addition, 2 deletionsmodules/wrc_core/wrc_periph.vhd
- modules/wrc_core/wrcore_pkg.vhd 4 additions, 2 deletionsmodules/wrc_core/wrcore_pkg.vhd
- modules/wrc_core/xwr_core.vhd 19 additions, 21 deletionsmodules/wrc_core/xwr_core.vhd
- modules/wrc_core/xwrc_diags_wb.vhd 0 additions, 1 deletionmodules/wrc_core/xwrc_diags_wb.vhd
Please register or sign in to comment