Skip to content

F
FMC ADC 100M 14b 4cha - Gateware
Commit f02a2fdf authored by Matthieu Cattin's avatar Matthieu Cattin
Browse files
Options

hdl: Uniformised sdb records input to crossbar.

parent 5e475118
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 34 deletions
hdl/spec/rtl/sdb_meta_pkg.vhd
View file @ f02a2fdf
...@@ -12,12 +12,12 @@ package sdb_meta_pkg is ...@@ -12,12 +12,12 @@ package sdb_meta_pkg is
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Top module repository url -- Top module repository url
constant c_REPO_URL : t_sdb_repo_url := ( constant c_SDB_REPO_URL : t_sdb_repo_url := (
-- url (string, 63 char) -- url (string, 63 char)
repo_url => "git://ohwr.org/fmc-projects/fmc-adc-100m14b4cha.git "); repo_url => "git://ohwr.org/fmc-projects/fmc-adc-100m14b4cha.git ");
-- Synthesis informations -- Synthesis informations
constant c_SYNTHESIS : t_sdb_synthesis := ( constant c_SDB_SYNTHESIS : t_sdb_synthesis := (
-- Top module name (string, 16 char) -- Top module name (string, 16 char)
syn_module_name => "spec_top_fmc_adc", syn_module_name => "spec_top_fmc_adc",
-- Commit ID (hex string, 128-bit = 32 char) -- Commit ID (hex string, 128-bit = 32 char)
...@@ -33,7 +33,7 @@ package sdb_meta_pkg is ...@@ -33,7 +33,7 @@ package sdb_meta_pkg is
syn_username => "mcattin "); syn_username => "mcattin ");
-- Integration record -- Integration record
constant c_INTEGRATION : t_sdb_integration := ( constant c_SDB_INTEGRATION : t_sdb_integration := (
product => ( product => (
vendor_id => x"000000000000CE42", -- CERN vendor_id => x"000000000000CE42", -- CERN
device_id => x"47c786a2", -- echo "spec_fmc-adc-100m14b4cha" | md5sum | cut -c1-8 device_id => x"47c786a2", -- echo "spec_fmc-adc-100m14b4cha" | md5sum | cut -c1-8
......
hdl/spec/rtl/spec_top_fmc_adc_100Ms.vhd
View file @ f02a2fdf
...@@ -239,13 +239,6 @@ architecture rtl of spec_top_fmc_adc_100Ms is ...@@ -239,13 +239,6 @@ architecture rtl of spec_top_fmc_adc_100Ms is
-- WARNING: All address in sdb and crossbar are BYTE addresses! -- WARNING: All address in sdb and crossbar are BYTE addresses!
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Meta-information sdb records
constant c_SDB_INFO : t_sdb_record_array(2 downto 0) := (
0 => f_sdb_embed_repo_url(c_REPO_URL),
1 => f_sdb_embed_synthesis(c_SYNTHESIS),
2 => f_sdb_embed_integration(c_INTEGRATION)
);
-- Number of master port(s) on the wishbone crossbar -- Number of master port(s) on the wishbone crossbar
constant c_NUM_WB_MASTERS : integer := 10; constant c_NUM_WB_MASTERS : integer := 10;
...@@ -267,6 +260,7 @@ architecture rtl of spec_top_fmc_adc_100Ms is ...@@ -267,6 +260,7 @@ architecture rtl of spec_top_fmc_adc_100Ms is
constant c_SLAVE_FMC_ADC : integer := 8; -- Mezzanine ADC core constant c_SLAVE_FMC_ADC : integer := 8; -- Mezzanine ADC core
constant c_SLAVE_FMC_ONEWIRE : integer := 9; -- Mezzanine onewire interface constant c_SLAVE_FMC_ONEWIRE : integer := 9; -- Mezzanine onewire interface
-- Devices sdb description -- Devices sdb description
constant c_DMA_SDB_DEVICE : t_sdb_device := ( constant c_DMA_SDB_DEVICE : t_sdb_device := (
abi_class => x"0000", -- undocumented device abi_class => x"0000", -- undocumented device
...@@ -400,18 +394,21 @@ architecture rtl of spec_top_fmc_adc_100Ms is ...@@ -400,18 +394,21 @@ architecture rtl of spec_top_fmc_adc_100Ms is
constant c_SDB_ADDRESS : t_wishbone_address := x"00000000"; constant c_SDB_ADDRESS : t_wishbone_address := x"00000000";
-- Wishbone crossbar layout -- Wishbone crossbar layout
constant c_INTERCONNECT_LAYOUT : t_sdb_record_array(c_NUM_WB_MASTERS-1 downto 0) := constant c_INTERCONNECT_LAYOUT : t_sdb_record_array(12 downto 0) :=
( (
c_SLAVE_DMA => f_sdb_embed_device(c_DMA_SDB_DEVICE, x"00001000"), 0 => f_sdb_embed_device(c_DMA_SDB_DEVICE, x"00001000"),
c_SLAVE_ONEWIRE => f_sdb_embed_device(c_ONEWIRE_SDB_DEVICE, x"00001200"), 1 => f_sdb_embed_device(c_ONEWIRE_SDB_DEVICE, x"00001200"),
c_SLAVE_SPEC_CSR => f_sdb_embed_device(c_SPEC_CSR_SDB_DEVICE, x"00001300"), 2 => f_sdb_embed_device(c_SPEC_CSR_SDB_DEVICE, x"00001300"),
c_SLAVE_UTC => f_sdb_embed_device(c_UTC_SDB_DEVICE, x"00001400"), 3 => f_sdb_embed_device(c_UTC_SDB_DEVICE, x"00001400"),
c_SLAVE_INT => f_sdb_embed_device(c_INT_SDB_DEVICE, x"00001500"), 4 => f_sdb_embed_device(c_INT_SDB_DEVICE, x"00001500"),
c_SLAVE_FMC_SYS_I2C => f_sdb_embed_device(c_I2C_SDB_DEVICE, x"00001600"), 5 => f_sdb_embed_device(c_I2C_SDB_DEVICE, x"00001600"),
c_SLAVE_FMC_SPI => f_sdb_embed_device(c_SPI_SDB_DEVICE, x"00001700"), 6 => f_sdb_embed_device(c_SPI_SDB_DEVICE, x"00001700"),
c_SLAVE_FMC_I2C => f_sdb_embed_device(c_I2C_SDB_DEVICE, x"00001800"), 7 => f_sdb_embed_device(c_I2C_SDB_DEVICE, x"00001800"),
c_SLAVE_FMC_ADC => f_sdb_embed_device(c_ADC_SDB_DEVICE, x"00001900"), 8 => f_sdb_embed_device(c_ADC_SDB_DEVICE, x"00001900"),
c_SLAVE_FMC_ONEWIRE => f_sdb_embed_device(c_ONEWIRE_SDB_DEVICE, x"00001A00") 9 => f_sdb_embed_device(c_ONEWIRE_SDB_DEVICE, x"00001A00"),
10 => f_sdb_embed_repo_url(c_SDB_REPO_URL),
11 => f_sdb_embed_synthesis(c_SDB_SYNTHESIS),
12 => f_sdb_embed_integration(c_SDB_INTEGRATION)
); );
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
...@@ -731,8 +728,6 @@ begin ...@@ -731,8 +728,6 @@ begin
g_num_slaves => c_NUM_WB_MASTERS, g_num_slaves => c_NUM_WB_MASTERS,
g_registered => true, g_registered => true,
g_wraparound => true, g_wraparound => true,
g_use_info => true,
g_info => c_SDB_INFO,
g_layout => c_INTERCONNECT_LAYOUT, g_layout => c_INTERCONNECT_LAYOUT,
g_sdb_addr => c_SDB_ADDRESS) g_sdb_addr => c_SDB_ADDRESS)
port map ( port map (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment