Merge branch 'FASECV2_fmcs_xadc_wrc_v20181' into master (b8f72b89) · Commits · Projects / FPGA and ARM SoC FMC Carrier FASEC

Commit b8f72b89 authored 5 years ago by

Pieter Van Trappen

Browse files

Merge branch 'FASECV2_fmcs_xadc_wrc_v20181' into master

parents 20c89525 c12ab1ae

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 1 deletion

.gitignore
.gitmodules 8 additions, 0 deletions

.gitmodules
FASEC_prototype.ip_user_files/bd/system_design/hdl/system_design.vhd 0 additions, 2085 deletions

...type.ip_user_files/bd/system_design/hdl/system_design.vhd
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_auto_pc_0/sim/system_design_auto_pc_0.v 0 additions, 348 deletions

.../ip/system_design_auto_pc_0/sim/system_design_auto_pc_0.v
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_axi_wb_i2c_master_0_0/sim/system_design_axi_wb_i2c_master_0_0.vhd 0 additions, 174 deletions

...2c_master_0_0/sim/system_design_axi_wb_i2c_master_0_0.vhd
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_axi_wb_i2c_master_1_0/sim/system_design_axi_wb_i2c_master_1_0.vhd 0 additions, 174 deletions

...2c_master_1_0/sim/system_design_axi_wb_i2c_master_1_0.vhd
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_fasec_hwtest_0_0/sim/system_design_fasec_hwtest_0_0.vhd 0 additions, 229 deletions

...n_fasec_hwtest_0_0/sim/system_design_fasec_hwtest_0_0.vhd
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_processing_system7_0_0/sim/system_design_processing_system7_0_0.v 0 additions, 586 deletions

...ng_system7_0_0/sim/system_design_processing_system7_0_0.v
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_rst_processing_system7_0_100M_2/sim/system_design_rst_processing_system7_0_100M_2.vhd 0 additions, 137 deletions

...M_2/sim/system_design_rst_processing_system7_0_100M_2.vhd
FASEC_prototype.ip_user_files/bd/system_design/ip/system_design_xbar_0/sim/system_design_xbar_0.v 0 additions, 302 deletions

...design/ip/system_design_xbar_0/sim/system_design_xbar_0.v
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/axi_wb_i2c_master_v2_3/src/axis_to_i2c_wbs_v1_0.vhd 0 additions, 207 deletions

...r.org/axi_wb_i2c_master_v2_3/src/axis_to_i2c_wbs_v1_0.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/axi_wb_i2c_master_v2_3/src/axis_wbm_bridge.vhd 0 additions, 284 deletions

...d/user.org/axi_wb_i2c_master_v2_3/src/axis_wbm_bridge.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/axi_wb_i2c_master_v2_3/src/i2c_master_bit_ctrl.vhd 0 additions, 576 deletions

...er.org/axi_wb_i2c_master_v2_3/src/i2c_master_bit_ctrl.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/axi_wb_i2c_master_v2_3/src/i2c_master_byte_ctrl.vhd 0 additions, 368 deletions

...r.org/axi_wb_i2c_master_v2_3/src/i2c_master_byte_ctrl.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/axi_wb_i2c_master_v2_3/src/i2c_master_top.vhd 0 additions, 359 deletions

...ed/user.org/axi_wb_i2c_master_v2_3/src/i2c_master_top.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/fasec_hwtest_v2_2_1/FASEC_hwtest.srcs/sources_1/new/general_fmc.vhd 0 additions, 206 deletions

...st_v2_2_1/FASEC_hwtest.srcs/sources_1/new/general_fmc.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/libraries/xil_pvtmisc/axi4lite_slave.vhd 0 additions, 409 deletions

...pshared/user.org/libraries/xil_pvtmisc/axi4lite_slave.vhd
FASEC_prototype.ip_user_files/bd/system_design/ipshared/user.org/libraries/xil_pvtmisc/myPackage.vhd 0 additions, 213 deletions

...ign/ipshared/user.org/libraries/xil_pvtmisc/myPackage.vhd
FASEC_prototype.ip_user_files/ipstatic/axi_datamover_v5_1/hdl/src/vhdl/axi_datamover.vhd 1630 additions, 0 deletions

...pstatic/axi_datamover_v5_1/hdl/src/vhdl/axi_datamover.vhd
FASEC_prototype.ip_user_files/ipstatic/axi_datamover_v5_1/hdl/src/vhdl/axi_datamover_addr_cntl.vhd 825 additions, 0 deletions

...i_datamover_v5_1/hdl/src/vhdl/axi_datamover_addr_cntl.vhd

with 2465 additions and 6658 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment