Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix/l0mdt usp #54

Merged
merged 3 commits into from
Mar 7, 2023
Merged

Bug fix/l0mdt usp #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80a5566
Some fixes for build
dgastler Feb 27, 2023
b0224e6
Merge branch 'develop' into bug_fix/l0mdt_usp
dgastler Feb 27, 2023
2aac1ee
Some fixes for address table generation in prebuild only setups
dgastler Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ PL_PATH=${MAKE_PATH}/src
BD_PATH=${MAKE_PATH}/bd
CORES_PATH=${MAKE_PATH}/cores
#ADDRESS_TABLE = ${MAKE_PATH}/os/address_table/address_apollo.xml
$(BIT_BASE)%.bit $(BIT_BASE)%.svf : ADDRESS_TABLE=${MAKE_PATH}/os/address_table_%/address_%.xml
#$(BIT_BASE)%.bit $(BIT_BASE)%.svf : ADDRESS_TABLE=${MAKE_PATH}/os/address_table_%/address_%.xml
$(BIT_BASE)%.bit $(BIT_BASE)%.svf : ADDRESS_TABLE=${MAKE_PATH}/kernel/address_table_%/address_%.xml
################################################################################
# Configs
#################################################################################
Expand All @@ -34,7 +35,7 @@ CONFIGS_BASE_PATH=configs/
CONFIGS=$(patsubst ${CONFIGS_BASE_PATH}%/,%,$(dir $(wildcard ${CONFIGS_BASE_PATH}*/)))

define CONFIGS_template =
$(1): clean autogen_clean_$(1)
$(1): clean autogen_clean_$(1) clean_overlays
time $(MAKE) $(BIT_BASE)$$(@).bit || $(MAKE) NOTIFY_DAN_BAD
endef
define CONFIGS_autoclean_template =
Expand Down
2 changes: 1 addition & 1 deletion build-scripts
Open in desktop
Submodule build-scripts updated from 42f41c to 75a638
1 change: 0 additions & 1 deletion configs/MPI_rev1_p1_KU15p-2-SM_7s/autogen
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion configs/MPI_rev1_p1_KU15p-2-SM_7s/cores
View file
Open in desktop

This file was deleted.

160 changes: 31 additions & 129 deletions configs/MPI_rev1_p1_KU15p-2-SM_USP/src/top.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,81 +149,44 @@ begin -- architecture structure
clk50Mhz => clk_50,
K_IO_araddr => local_AXI_ReadMOSI(0).address,
K_IO_arprot => local_AXI_ReadMOSI(0).protection_type,
K_IO_arready => local_AXI_ReadMISO(0).ready_for_address,
K_IO_arvalid => local_AXI_ReadMOSI(0).address_valid,
K_IO_arready(0) => local_AXI_ReadMISO(0).ready_for_address,
K_IO_arvalid(0) => local_AXI_ReadMOSI(0).address_valid,
K_IO_awaddr => local_AXI_WriteMOSI(0).address,
K_IO_awprot => local_AXI_WriteMOSI(0).protection_type,
K_IO_awready => local_AXI_WriteMISO(0).ready_for_address,
K_IO_awvalid => local_AXI_WriteMOSI(0).address_valid,
K_IO_bready => local_AXI_WriteMOSI(0).ready_for_response,
K_IO_awready(0) => local_AXI_WriteMISO(0).ready_for_address,
K_IO_awvalid(0) => local_AXI_WriteMOSI(0).address_valid,
K_IO_bready(0) => local_AXI_WriteMOSI(0).ready_for_response,
K_IO_bresp => local_AXI_WriteMISO(0).response,
K_IO_bvalid => local_AXI_WriteMISO(0).response_valid,
K_IO_bvalid(0) => local_AXI_WriteMISO(0).response_valid,
K_IO_rdata => local_AXI_ReadMISO(0).data,
K_IO_rready => local_AXI_ReadMOSI(0).ready_for_data,
K_IO_rready(0) => local_AXI_ReadMOSI(0).ready_for_data,
K_IO_rresp => local_AXI_ReadMISO(0).response,
K_IO_rvalid => local_AXI_ReadMISO(0).data_valid,
K_IO_rvalid(0) => local_AXI_ReadMISO(0).data_valid,
K_IO_wdata => local_AXI_WriteMOSI(0).data,
K_IO_wready => local_AXI_WriteMISO(0).ready_for_data,
K_IO_wready(0) => local_AXI_WriteMISO(0).ready_for_data,
K_IO_wstrb => local_AXI_WriteMOSI(0).data_write_strobe,
K_IO_wvalid => local_AXI_WriteMOSI(0).data_valid,
K_IO_wvalid(0) => local_AXI_WriteMOSI(0).data_valid,
K_CM_FW_INFO_araddr => local_AXI_ReadMOSI(1).address,
K_CM_FW_INFO_arprot => local_AXI_ReadMOSI(1).protection_type,
K_CM_FW_INFO_arready => local_AXI_ReadMISO(1).ready_for_address,
K_CM_FW_INFO_arvalid => local_AXI_ReadMOSI(1).address_valid,
K_CM_FW_INFO_arready(0) => local_AXI_ReadMISO(1).ready_for_address,
K_CM_FW_INFO_arvalid(0) => local_AXI_ReadMOSI(1).address_valid,
K_CM_FW_INFO_awaddr => local_AXI_WriteMOSI(1).address,
K_CM_FW_INFO_awprot => local_AXI_WriteMOSI(1).protection_type,
K_CM_FW_INFO_awready => local_AXI_WriteMISO(1).ready_for_address,
K_CM_FW_INFO_awvalid => local_AXI_WriteMOSI(1).address_valid,
K_CM_FW_INFO_bready => local_AXI_WriteMOSI(1).ready_for_response,
K_CM_FW_INFO_awready(0) => local_AXI_WriteMISO(1).ready_for_address,
K_CM_FW_INFO_awvalid(0) => local_AXI_WriteMOSI(1).address_valid,
K_CM_FW_INFO_bready(0) => local_AXI_WriteMOSI(1).ready_for_response,
K_CM_FW_INFO_bresp => local_AXI_WriteMISO(1).response,
K_CM_FW_INFO_bvalid => local_AXI_WriteMISO(1).response_valid,
K_CM_FW_INFO_bvalid(0) => local_AXI_WriteMISO(1).response_valid,
K_CM_FW_INFO_rdata => local_AXI_ReadMISO(1).data,
K_CM_FW_INFO_rready => local_AXI_ReadMOSI(1).ready_for_data,
K_CM_FW_INFO_rready(0) => local_AXI_ReadMOSI(1).ready_for_data,
K_CM_FW_INFO_rresp => local_AXI_ReadMISO(1).response,
K_CM_FW_INFO_rvalid => local_AXI_ReadMISO(1).data_valid,
K_CM_FW_INFO_rvalid(0) => local_AXI_ReadMISO(1).data_valid,
K_CM_FW_INFO_wdata => local_AXI_WriteMOSI(1).data,
K_CM_FW_INFO_wready => local_AXI_WriteMISO(1).ready_for_data,
K_CM_FW_INFO_wready(0) => local_AXI_WriteMISO(1).ready_for_data,
K_CM_FW_INFO_wstrb => local_AXI_WriteMOSI(1).data_write_strobe,
K_CM_FW_INFO_wvalid => local_AXI_WriteMOSI(1).data_valid,

KINTEX_BRAM_araddr => ext_AXI_ReadMOSI.address,
KINTEX_BRAM_arburst => ext_AXI_ReadMOSI.burst_type,
KINTEX_BRAM_arcache => ext_AXI_ReadMOSI.cache_type,
KINTEX_BRAM_arlen => ext_AXI_ReadMOSI.burst_length,
KINTEX_BRAM_arlock(0) => ext_AXI_ReadMOSI.lock_type,
KINTEX_BRAM_arprot => ext_AXI_ReadMOSI.protection_type,
KINTEX_BRAM_arqos => ext_AXI_ReadMOSI.qos,
KINTEX_BRAM_arready(0) => ext_AXI_ReadMISO.ready_for_address,
KINTEX_BRAM_arregion => ext_AXI_ReadMOSI.region,
KINTEX_BRAM_arsize => ext_AXI_ReadMOSI.burst_size,
KINTEX_BRAM_arvalid(0) => ext_AXI_ReadMOSI.address_valid,
KINTEX_BRAM_awaddr => ext_AXI_WriteMOSI.address,
KINTEX_BRAM_awburst => ext_AXI_WriteMOSI.burst_type,
KINTEX_BRAM_awcache => ext_AXI_WriteMOSI.cache_type,
KINTEX_BRAM_awlen => ext_AXI_WriteMOSI.burst_length,
KINTEX_BRAM_awlock(0) => ext_AXI_WriteMOSI.lock_type,
KINTEX_BRAM_awprot => ext_AXI_WriteMOSI.protection_type,
KINTEX_BRAM_awqos => ext_AXI_WriteMOSI.qos,
KINTEX_BRAM_awready(0) => ext_AXI_WriteMISO.ready_for_address,
KINTEX_BRAM_awregion => ext_AXI_WriteMOSI.region,
KINTEX_BRAM_awsize => ext_AXI_WriteMOSI.burst_size,
KINTEX_BRAM_awvalid(0) => ext_AXI_WriteMOSI.address_valid,
KINTEX_BRAM_bready(0) => ext_AXI_WriteMOSI.ready_for_response,
KINTEX_BRAM_bresp => ext_AXI_WriteMISO.response,
KINTEX_BRAM_bvalid(0) => ext_AXI_WriteMISO.response_valid,
KINTEX_BRAM_rdata => ext_AXI_ReadMISO.data,
KINTEX_BRAM_rlast(0) => ext_AXI_ReadMISO.last,
KINTEX_BRAM_rready(0) => ext_AXI_ReadMOSI.ready_for_data,
KINTEX_BRAM_rresp => ext_AXI_ReadMISO.response,
KINTEX_BRAM_rvalid(0) => ext_AXI_ReadMISO.data_valid,
KINTEX_BRAM_wdata => ext_AXI_WriteMOSI.data,
KINTEX_BRAM_wlast(0) => ext_AXI_WriteMOSI.last,
KINTEX_BRAM_wready(0) => ext_AXI_WriteMISO.ready_for_data,
KINTEX_BRAM_wstrb => ext_AXI_WriteMOSI.data_write_strobe,
KINTEX_BRAM_wvalid(0) => ext_AXI_WriteMOSI.data_valid,
K_CM_FW_INFO_wvalid(0) => local_AXI_WriteMOSI(1).data_valid,




reset_n => locked_clk200,--reset,
K_C2C_PHY_DEBUG_cplllock(0) => C2C_Mon.C2C(1).DEBUG.CPLL_LOCK,
K_C2C_PHY_DEBUG_dmonitorout => C2C_Mon.C2C(1).DEBUG.DMONITOR,
Expand Down Expand Up @@ -334,23 +297,23 @@ begin -- architecture structure

K_C2C_INTF_araddr => local_AXI_ReadMOSI(2).address,
K_C2C_INTF_arprot => local_AXI_ReadMOSI(2).protection_type,
K_C2C_INTF_arready => local_AXI_ReadMISO(2).ready_for_address,
K_C2C_INTF_arvalid => local_AXI_ReadMOSI(2).address_valid,
K_C2C_INTF_arready(0) => local_AXI_ReadMISO(2).ready_for_address,
K_C2C_INTF_arvalid(0) => local_AXI_ReadMOSI(2).address_valid,
K_C2C_INTF_awaddr => local_AXI_WriteMOSI(2).address,
K_C2C_INTF_awprot => local_AXI_WriteMOSI(2).protection_type,
K_C2C_INTF_awready => local_AXI_WriteMISO(2).ready_for_address,
K_C2C_INTF_awvalid => local_AXI_WriteMOSI(2).address_valid,
K_C2C_INTF_bready => local_AXI_WriteMOSI(2).ready_for_response,
K_C2C_INTF_awready(0) => local_AXI_WriteMISO(2).ready_for_address,
K_C2C_INTF_awvalid(0) => local_AXI_WriteMOSI(2).address_valid,
K_C2C_INTF_bready(0) => local_AXI_WriteMOSI(2).ready_for_response,
K_C2C_INTF_bresp => local_AXI_WriteMISO(2).response,
K_C2C_INTF_bvalid => local_AXI_WriteMISO(2).response_valid,
K_C2C_INTF_bvalid(0) => local_AXI_WriteMISO(2).response_valid,
K_C2C_INTF_rdata => local_AXI_ReadMISO(2).data,
K_C2C_INTF_rready => local_AXI_ReadMOSI(2).ready_for_data,
K_C2C_INTF_rready(0) => local_AXI_ReadMOSI(2).ready_for_data,
K_C2C_INTF_rresp => local_AXI_ReadMISO(2).response,
K_C2C_INTF_rvalid => local_AXI_ReadMISO(2).data_valid,
K_C2C_INTF_rvalid(0) => local_AXI_ReadMISO(2).data_valid,
K_C2C_INTF_wdata => local_AXI_WriteMOSI(2).data,
K_C2C_INTF_wready => local_AXI_WriteMISO(2).ready_for_data,
K_C2C_INTF_wready(0) => local_AXI_WriteMISO(2).ready_for_data,
K_C2C_INTF_wstrb => local_AXI_WriteMOSI(2).data_write_strobe,
K_C2C_INTF_wvalid => local_AXI_WriteMOSI(2).data_valid
K_C2C_INTF_wvalid(0) => local_AXI_WriteMOSI(2).data_valid


);
Expand Down Expand Up @@ -424,67 +387,6 @@ begin -- architecture structure
Ctrl => C2C_Ctrl);


AXI_BRAM_1: entity work.AXI_BRAM
port map (
s_axi_aclk => AXI_CLK,
s_axi_aresetn => AXI_RST_N,
s_axi_araddr => ext_AXI_ReadMOSI.address(12 downto 0),
s_axi_arburst => ext_AXI_ReadMOSI.burst_type,
s_axi_arcache => ext_AXI_ReadMOSI.cache_type,
s_axi_arlen => ext_AXI_ReadMOSI.burst_length,
s_axi_arlock => ext_AXI_ReadMOSI.lock_type,
s_axi_arprot => ext_AXI_ReadMOSI.protection_type,
-- s_axi_arqos => ext_AXI_ReadMOSI.qos,
s_axi_arready => ext_AXI_ReadMISO.ready_for_address,
-- s_axi_arregion => ext_AXI_ReadMOSI.region,
s_axi_arsize => ext_AXI_ReadMOSI.burst_size,
s_axi_arvalid => ext_AXI_ReadMOSI.address_valid,
s_axi_awaddr => ext_AXI_WriteMOSI.address(12 downto 0),
s_axi_awburst => ext_AXI_WriteMOSI.burst_type,
s_axi_awcache => ext_AXI_WriteMOSI.cache_type,
s_axi_awlen => ext_AXI_WriteMOSI.burst_length,
s_axi_awlock => ext_AXI_WriteMOSI.lock_type,
s_axi_awprot => ext_AXI_WriteMOSI.protection_type,
-- s_axi_awqos => ext_AXI_WriteMOSI.qos,
s_axi_awready => ext_AXI_WriteMISO.ready_for_address,
-- s_axi_awregion => ext_AXI_WriteMOSI.region,
s_axi_awsize => ext_AXI_WriteMOSI.burst_size,
s_axi_awvalid => ext_AXI_WriteMOSI.address_valid,
s_axi_bready => ext_AXI_WriteMOSI.ready_for_response,
s_axi_bresp => ext_AXI_WriteMISO.response,
s_axi_bvalid => ext_AXI_WriteMISO.response_valid,
s_axi_rdata => ext_AXI_ReadMISO.data,
s_axi_rlast => ext_AXI_ReadMISO.last,
s_axi_rready => ext_AXI_ReadMOSI.ready_for_data,
s_axi_rresp => ext_AXI_ReadMISO.response,
s_axi_rvalid => ext_AXI_ReadMISO.data_valid,
s_axi_wdata => ext_AXI_WriteMOSI.data,
s_axi_wlast => ext_AXI_WriteMOSI.last,
s_axi_wready => ext_AXI_WriteMISO.ready_for_data,
s_axi_wstrb => ext_AXI_WriteMOSI.data_write_strobe,
s_axi_wvalid => ext_AXI_WriteMOSI.data_valid,
bram_rst_a => open,
bram_clk_a => AXI_CLK,
bram_en_a => AXI_BRAM_en,
bram_we_a => AXI_BRAM_we,
bram_addr_a => AXI_BRAM_addr,
bram_wrdata_a => AXI_BRAM_DATA_IN,
bram_rddata_a => AXI_BRAM_DATA_OUT);

DP_BRAM_1: entity work.DP_BRAM
port map (
clka => AXI_CLK,
ena => AXI_BRAM_EN,
wea => AXI_BRAM_we,
addra => AXI_BRAM_addr(11 downto 2),
dina => AXI_BRAM_DATA_IN,
douta => AXI_BRAM_DATA_OUT,
clkb => AXI_CLK,
enb => '1',
web => (others => BRAM_WRITE),
addrb => BRAM_ADDR,
dinb => BRAM_WR_DATA,
doutb => BRAM_RD_DATA);


end architecture structure;
10 changes: 5 additions & 5 deletions cores/AXI_BRAM/AXI_BRAM.xci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_ECC">0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_ECC_ONOFF_RESET_VALUE">0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_ECC_TYPE">0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_FAMILY">virtexuplus</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_FAMILY">kintexuplus</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_FAULT_INJECT">0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_MEMORY_DEPTH">1024</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="MODELPARAM_VALUE.C_RD_CMD_OPTIMIZATION">0</spirit:configurableElementValue>
Expand All @@ -120,15 +120,15 @@
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.SINGLE_PORT_BRAM">1</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.SUPPORTS_NARROW_BURST">1</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.USE_ECC">0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.ARCHITECTURE">virtexuplus</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.ARCHITECTURE">kintexuplus</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.BASE_BOARD_PART"/>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.BOARD_CONNECTIONS"/>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.DEVICE">xcvu13p</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.PACKAGE">flga2577</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.DEVICE">xcku15p</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.PACKAGE">ffva1760</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.PREFHDL">VHDL</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.SILICON_REVISION"/>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.SIMULATOR_LANGUAGE">MIXED</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.SPEEDGRADE">-1</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.SPEEDGRADE">-2</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.STATIC_POWER"/>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.TEMPERATURE_GRADE">E</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PROJECT_PARAM.USE_RDI_CUSTOMIZATION">TRUE</spirit:configurableElementValue>
Expand Down
Loading