diff --git a/carfield.mk b/carfield.mk index d4cdbf2d..a0dd2780 100644 --- a/carfield.mk +++ b/carfield.mk @@ -44,7 +44,7 @@ include $(CAR_ROOT)/bender-safed.mk ###################### CAR_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:carfield/carfield-nonfree.git -CAR_NONFREE_COMMIT ?= d24785a0 +CAR_NONFREE_COMMIT ?= 5a024891 ## @section Carfield platform nonfree components ## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC diff --git a/target/xilinx/flavor_bd/scripts/carfield_bd_vcu118.tcl b/target/xilinx/flavor_bd/scripts/carfield_bd_vcu118.tcl index b25e42f0..522683d7 100644 --- a/target/xilinx/flavor_bd/scripts/carfield_bd_vcu118.tcl +++ b/target/xilinx/flavor_bd/scripts/carfield_bd_vcu118.tcl @@ -237,8 +237,6 @@ proc create_root_design { parentCell } { set_property -dict [ list \ CONFIG.POLARITY {ACTIVE_LOW} \ ] $pcie_perstn - set phy_reset_out [ create_bd_port -dir O -from 0 -to 0 -type rst phy_reset_out ] - set uart_rx_i [ create_bd_port -dir I uart_rx_i ] set uart_tx_o [ create_bd_port -dir O uart_tx_o ] @@ -258,13 +256,17 @@ proc create_root_design { parentCell } { CONFIG.DIFFCLK_BOARD_INTERFACE {sgmii_phyclk} \ CONFIG.ENABLE_LVDS {true} \ CONFIG.ETHERNET_BOARD_INTERFACE {sgmii_lvds} \ + CONFIG.InstantiateBitslice0 {true} \ CONFIG.MDIO_BOARD_INTERFACE {mdio_mdc} \ - CONFIG.PHYRST_BOARD_INTERFACE {phy_reset_out} \ + CONFIG.PHYADDR {0} \ + CONFIG.PHYRST_BOARD_INTERFACE {Custom} \ CONFIG.PHY_TYPE {SGMII} \ CONFIG.gtlocation {X0Y4} \ CONFIG.lvdsclkrate {625} \ - CONFIG.tx_in_upper_nibble {false} \ - CONFIG.txlane0_placement {DIFF_PAIR_2} \ + CONFIG.rxlane0_placement {DIFF_PAIR_2} \ + CONFIG.rxnibblebitslice0used {true} \ + CONFIG.tx_in_upper_nibble {true} \ + CONFIG.txlane0_placement {DIFF_PAIR_1} \ ] $axi_ethernet_0 # Create instance: carfield_xilinx_ip_0, and set properties @@ -476,7 +478,6 @@ proc create_root_design { parentCell } { connect_bd_net -net axi_dma_0_s2mm_sts_reset_out_n [get_bd_pins axi_dma_0/s2mm_sts_reset_out_n] [get_bd_pins axi_ethernet_0/axi_rxs_arstn] connect_bd_net -net axi_ethernet_0_interrupt [get_bd_pins axi_ethernet_0/interrupt] [get_bd_pins concat_irq/In0] connect_bd_net -net axi_ethernet_0_mac_irq [get_bd_pins axi_ethernet_0/mac_irq] [get_bd_pins concat_irq/In5] - connect_bd_net -net axi_ethernet_0_phy_rst_n [get_bd_ports phy_reset_out] [get_bd_pins axi_ethernet_0/phy_rst_n] connect_bd_net -net carfield_xilinx_ip_0_dram_axi_m_aclk [get_bd_pins carfield_xilinx_ip_0/dram_axi_m_aclk] [get_bd_pins xbar_dram/aclk] connect_bd_net -net carfield_xilinx_ip_0_periph_axi_m_aclk [get_bd_pins carfield_xilinx_ip_0/periph_axi_m_aclk] [get_bd_pins xbar_periph_out/aclk] connect_bd_net -net carfield_xilinx_ip_0_uart_tx_o [get_bd_ports uart_tx_o] [get_bd_pins carfield_xilinx_ip_0/uart_tx_o]