From e9826265daa93358767a475346e2c153f8ffa2cd Mon Sep 17 00:00:00 2001 From: Zhukun Wang Date: Sat, 16 Mar 2024 13:20:18 +0000 Subject: [PATCH 1/2] Update --- .../reference_nic/hw/tcl/reference_nic_defines.tcl | 12 ++++++------ .../reference_nic/hw/tcl/reference_nic_sim.tcl | 6 +++--- .../hw/tcl/reference_router_defines.tcl | 12 ++++++------ .../reference_router/hw/tcl/reference_router_sim.tcl | 6 +++--- .../hw/tcl/reference_switch_defines.tcl | 12 ++++++------ .../reference_switch/hw/tcl/reference_switch_sim.tcl | 6 +++--- .../hw/tcl/reference_switch_lite_defines.tcl | 12 ++++++------ .../hw/tcl/reference_switch_lite_sim.tcl | 6 +++--- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/hw/projects/reference_nic/hw/tcl/reference_nic_defines.tcl b/hw/projects/reference_nic/hw/tcl/reference_nic_defines.tcl index dba3b82..3b1b3a5 100644 --- a/hw/projects/reference_nic/hw/tcl/reference_nic_defines.tcl +++ b/hw/projects/reference_nic/hw/tcl/reference_nic_defines.tcl @@ -32,18 +32,18 @@ # Segments Assignment # ####################### #M00 -set M00_BASEADDR 0x00010000 -set M00_HIGHADDR 0x00010FFF +set M00_BASEADDR 0x00200000 +set M00_HIGHADDR 0x00200FFF set M00_SIZEADDR 0x1000 #M01 -set M01_BASEADDR 0x00020000 -set M01_HIGHADDR 0x00020FFF +set M01_BASEADDR 0x00210000 +set M01_HIGHADDR 0x00210FFF set M01_SIZEADDR 0x1000 #M02 -set M02_BASEADDR 0x00030000 -set M02_HIGHADDR 0x00030FFF +set M02_BASEADDR 0x00220000 +set M02_HIGHADDR 0x00220FFF set M02_SIZEADDR 0x1000 ##M03 diff --git a/hw/projects/reference_nic/hw/tcl/reference_nic_sim.tcl b/hw/projects/reference_nic/hw/tcl/reference_nic_sim.tcl index 8bcaa4a..1d93d8d 100644 --- a/hw/projects/reference_nic/hw/tcl/reference_nic_sim.tcl +++ b/hw/projects/reference_nic/hw/tcl/reference_nic_sim.tcl @@ -212,9 +212,9 @@ CONFIG.S00_SINGLE_THREAD {1} \ CONFIG.M00_A00_ADDR_WIDTH {16} \ CONFIG.M01_A00_ADDR_WIDTH {16} \ CONFIG.M02_A00_ADDR_WIDTH {16} \ -CONFIG.M00_A00_BASE_ADDR {0x0000000000010000}\ -CONFIG.M01_A00_BASE_ADDR {0x0000000000020000}\ -CONFIG.M02_A00_BASE_ADDR {0x0000000000030000}] [get_ips axi_crossbar_0] +CONFIG.M00_A00_BASE_ADDR {0x0000000000200000}\ +CONFIG.M01_A00_BASE_ADDR {0x0000000000210000}\ +CONFIG.M02_A00_BASE_ADDR {0x0000000000220000}] [get_ips axi_crossbar_0] set_property generate_synth_checkpoint false [get_files axi_crossbar_0.xci] reset_target all [get_ips axi_crossbar_0] generate_target all [get_ips axi_crossbar_0] diff --git a/hw/projects/reference_router/hw/tcl/reference_router_defines.tcl b/hw/projects/reference_router/hw/tcl/reference_router_defines.tcl index 5461aca..68d0eba 100644 --- a/hw/projects/reference_router/hw/tcl/reference_router_defines.tcl +++ b/hw/projects/reference_router/hw/tcl/reference_router_defines.tcl @@ -34,18 +34,18 @@ # Segments Assignment # ####################### #M00 -set M00_BASEADDR 0x00010000 -set M00_HIGHADDR 0x00010FFF +set M00_BASEADDR 0x00200000 +set M00_HIGHADDR 0x00200FFF set M00_SIZEADDR 0x1000 #M01 -set M01_BASEADDR 0x00020000 -set M01_HIGHADDR 0x00020FFF +set M01_BASEADDR 0x00210000 +set M01_HIGHADDR 0x00210FFF set M01_SIZEADDR 0x1000 #M02 -set M02_BASEADDR 0x00030000 -set M02_HIGHADDR 0x00030FFF +set M02_BASEADDR 0x00220000 +set M02_HIGHADDR 0x00220FFF set M02_SIZEADDR 0x1000 ##M03 diff --git a/hw/projects/reference_router/hw/tcl/reference_router_sim.tcl b/hw/projects/reference_router/hw/tcl/reference_router_sim.tcl index 25c929b..d667147 100644 --- a/hw/projects/reference_router/hw/tcl/reference_router_sim.tcl +++ b/hw/projects/reference_router/hw/tcl/reference_router_sim.tcl @@ -219,9 +219,9 @@ CONFIG.S00_SINGLE_THREAD {1} \ CONFIG.M00_A00_ADDR_WIDTH {16} \ CONFIG.M01_A00_ADDR_WIDTH {16} \ CONFIG.M02_A00_ADDR_WIDTH {16} \ -CONFIG.M00_A00_BASE_ADDR {0x0000000000010000}\ -CONFIG.M01_A00_BASE_ADDR {0x0000000000020000}\ -CONFIG.M02_A00_BASE_ADDR {0x0000000000030000}] [get_ips axi_crossbar_0] +CONFIG.M00_A00_BASE_ADDR {0x0000000000200000}\ +CONFIG.M01_A00_BASE_ADDR {0x0000000000210000}\ +CONFIG.M02_A00_BASE_ADDR {0x0000000000220000}] [get_ips axi_crossbar_0] set_property generate_synth_checkpoint false [get_files axi_crossbar_0.xci] reset_target all [get_ips axi_crossbar_0] generate_target all [get_ips axi_crossbar_0] diff --git a/hw/projects/reference_switch/hw/tcl/reference_switch_defines.tcl b/hw/projects/reference_switch/hw/tcl/reference_switch_defines.tcl index 75e1d79..003e676 100644 --- a/hw/projects/reference_switch/hw/tcl/reference_switch_defines.tcl +++ b/hw/projects/reference_switch/hw/tcl/reference_switch_defines.tcl @@ -33,18 +33,18 @@ # Segments Assignment # ####################### #M00 -set M00_BASEADDR 0x00010000 -set M00_HIGHADDR 0x00010FFF +set M00_BASEADDR 0x00200000 +set M00_HIGHADDR 0x00200FFF set M00_SIZEADDR 0x1000 #M01 -set M01_BASEADDR 0x00020000 -set M01_HIGHADDR 0x00020FFF +set M01_BASEADDR 0x00210000 +set M01_HIGHADDR 0x00210FFF set M01_SIZEADDR 0x1000 #M02 -set M02_BASEADDR 0x00030000 -set M02_HIGHADDR 0x00030FFF +set M02_BASEADDR 0x00220000 +set M02_HIGHADDR 0x00220FFF set M02_SIZEADDR 0x1000 ##M03 diff --git a/hw/projects/reference_switch/hw/tcl/reference_switch_sim.tcl b/hw/projects/reference_switch/hw/tcl/reference_switch_sim.tcl index 152b5db..4b732be 100644 --- a/hw/projects/reference_switch/hw/tcl/reference_switch_sim.tcl +++ b/hw/projects/reference_switch/hw/tcl/reference_switch_sim.tcl @@ -215,9 +215,9 @@ CONFIG.S00_SINGLE_THREAD {1} \ CONFIG.M00_A00_ADDR_WIDTH {16} \ CONFIG.M01_A00_ADDR_WIDTH {16} \ CONFIG.M02_A00_ADDR_WIDTH {16} \ -CONFIG.M00_A00_BASE_ADDR {0x0000000000010000}\ -CONFIG.M01_A00_BASE_ADDR {0x0000000000020000}\ -CONFIG.M02_A00_BASE_ADDR {0x0000000000030000}] [get_ips axi_crossbar_0] +CONFIG.M00_A00_BASE_ADDR {0x0000000000200000}\ +CONFIG.M01_A00_BASE_ADDR {0x0000000000210000}\ +CONFIG.M02_A00_BASE_ADDR {0x0000000000220000}] [get_ips axi_crossbar_0] set_property generate_synth_checkpoint false [get_files axi_crossbar_0.xci] reset_target all [get_ips axi_crossbar_0] generate_target all [get_ips axi_crossbar_0] diff --git a/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_defines.tcl b/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_defines.tcl index ffa7681..d5958a0 100644 --- a/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_defines.tcl +++ b/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_defines.tcl @@ -32,18 +32,18 @@ # Segments Assignment # ####################### #M00 -set M00_BASEADDR 0x00010000 -set M00_HIGHADDR 0x00010FFF +set M00_BASEADDR 0x00200000 +set M00_HIGHADDR 0x00200FFF set M00_SIZEADDR 0x1000 #M01 -set M01_BASEADDR 0x00020000 -set M01_HIGHADDR 0x00020FFF +set M01_BASEADDR 0x00210000 +set M01_HIGHADDR 0x00210FFF set M01_SIZEADDR 0x1000 #M02 -set M02_BASEADDR 0x00030000 -set M02_HIGHADDR 0x00030FFF +set M02_BASEADDR 0x00220000 +set M02_HIGHADDR 0x00220FFF set M02_SIZEADDR 0x1000 ##M03 diff --git a/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_sim.tcl b/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_sim.tcl index 3c64ddf..2c51873 100644 --- a/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_sim.tcl +++ b/hw/projects/reference_switch_lite/hw/tcl/reference_switch_lite_sim.tcl @@ -216,9 +216,9 @@ CONFIG.S00_SINGLE_THREAD {1} \ CONFIG.M00_A00_ADDR_WIDTH {16} \ CONFIG.M01_A00_ADDR_WIDTH {16} \ CONFIG.M02_A00_ADDR_WIDTH {16} \ -CONFIG.M00_A00_BASE_ADDR {0x0000000000010000}\ -CONFIG.M01_A00_BASE_ADDR {0x0000000000020000}\ -CONFIG.M02_A00_BASE_ADDR {0x0000000000030000}] [get_ips axi_crossbar_0] +CONFIG.M00_A00_BASE_ADDR {0x0000000000200000}\ +CONFIG.M01_A00_BASE_ADDR {0x0000000000210000}\ +CONFIG.M02_A00_BASE_ADDR {0x0000000000220000}] [get_ips axi_crossbar_0] set_property generate_synth_checkpoint false [get_files axi_crossbar_0.xci] reset_target all [get_ips axi_crossbar_0] generate_target all [get_ips axi_crossbar_0] From a5e30b3a9ac11d67d379b215ffc14a90ffadcf3d Mon Sep 17 00:00:00 2001 From: Zhukun Wang Date: Mon, 18 Mar 2024 15:38:12 +0000 Subject: [PATCH 2/2] Update Submodule --- hw/lib/xilinx/xilinx_shell_v1_0_0/open-nic-shell | 2 +- sw/driver/open-nic-driver | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/lib/xilinx/xilinx_shell_v1_0_0/open-nic-shell b/hw/lib/xilinx/xilinx_shell_v1_0_0/open-nic-shell index 39c82df..8077751 160000 --- a/hw/lib/xilinx/xilinx_shell_v1_0_0/open-nic-shell +++ b/hw/lib/xilinx/xilinx_shell_v1_0_0/open-nic-shell @@ -1 +1 @@ -Subproject commit 39c82dfdf046e1e06f72a8cafe4fbc006659dfb6 +Subproject commit 80777515c83cc04d8497522669aa82dd914d1e08 diff --git a/sw/driver/open-nic-driver b/sw/driver/open-nic-driver index a2a5158..1cf2578 160000 --- a/sw/driver/open-nic-driver +++ b/sw/driver/open-nic-driver @@ -1 +1 @@ -Subproject commit a2a5158c853625f321dd0a5288f507a5b5bac4b0 +Subproject commit 1cf25782ba39bb23fe6cfbc75eac6ee0b6249e76