Skip to content
Snippets Groups Projects
Commit a4a51668 authored by Kenneth Hiemstra's avatar Kenneth Hiemstra
Browse files

added the c_rom_version and c_technology fields to system info

parent c95c5982
No related branches found
No related tags found
No related merge requests found
...@@ -248,6 +248,8 @@ END ctrl_unb2_board; ...@@ -248,6 +248,8 @@ END ctrl_unb2_board;
ARCHITECTURE str OF ctrl_unb2_board IS ARCHITECTURE str OF ctrl_unb2_board IS
CONSTANT c_rom_version : NATURAL := 1; -- Only increment when something changes to the register map of rom_system_info.
CONSTANT c_reset_len : NATURAL := 4; -- >= c_meta_delay_len from common_pkg CONSTANT c_reset_len : NATURAL := 4; -- >= c_meta_delay_len from common_pkg
-- Clock and reset -- Clock and reset
...@@ -495,7 +497,8 @@ BEGIN ...@@ -495,7 +497,8 @@ BEGIN
g_stamp_date => g_stamp_date, g_stamp_date => g_stamp_date,
g_stamp_time => g_stamp_time, g_stamp_time => g_stamp_time,
g_stamp_svn => g_stamp_svn, g_stamp_svn => g_stamp_svn,
g_design_note => g_design_note g_design_note => g_design_note,
g_rom_version => c_rom_version
) )
PORT MAP ( PORT MAP (
mm_clk => i_mm_clk, mm_clk => i_mm_clk,
......
...@@ -36,6 +36,7 @@ ENTITY mms_unb2_board_system_info IS ...@@ -36,6 +36,7 @@ ENTITY mms_unb2_board_system_info IS
g_stamp_time : NATURAL := 0; g_stamp_time : NATURAL := 0;
g_stamp_svn : NATURAL := 0; g_stamp_svn : NATURAL := 0;
g_design_note : STRING := ""; g_design_note : STRING := "";
g_rom_version : NATURAL := 1;
g_aux : t_c_unb2_board_aux := c_unb2_board_aux -- aux contains the hardware version g_aux : t_c_unb2_board_aux := c_unb2_board_aux -- aux contains the hardware version
); );
PORT ( PORT (
...@@ -90,7 +91,9 @@ BEGIN ...@@ -90,7 +91,9 @@ BEGIN
u_unb2_board_system_info: ENTITY work.unb2_board_system_info u_unb2_board_system_info: ENTITY work.unb2_board_system_info
GENERIC MAP ( GENERIC MAP (
g_sim => g_sim, g_sim => g_sim,
g_fw_version => g_fw_version g_fw_version => g_fw_version,
g_rom_version => g_rom_version,
g_technology => g_technology
) )
PORT MAP ( PORT MAP (
clk => mm_clk, clk => mm_clk,
......
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
-- --
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
LIBRARY IEEE, common_lib; LIBRARY IEEE, common_lib, technology_lib;
USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.STD_LOGIC_1164.ALL;
USE common_lib.common_pkg.ALL; USE common_lib.common_pkg.ALL;
USE work.unb2_board_pkg.ALL; USE work.unb2_board_pkg.ALL;
USE technology_lib.technology_pkg.ALL;
-- Keep the UniBoard system info knowledge in this HDL entity and in the -- Keep the UniBoard system info knowledge in this HDL entity and in the
-- corresponding software functions in unb_common.c,h. This avoids having to -- corresponding software functions in unb_common.c,h. This avoids having to
...@@ -33,7 +34,9 @@ ENTITY unb2_board_system_info IS ...@@ -33,7 +34,9 @@ ENTITY unb2_board_system_info IS
GENERIC ( GENERIC (
g_sim : BOOLEAN := FALSE; g_sim : BOOLEAN := FALSE;
g_fw_version : t_unb2_board_fw_version := c_unb2_board_fw_version; -- firmware version x.y (4b.4b) g_fw_version : t_unb2_board_fw_version := c_unb2_board_fw_version; -- firmware version x.y (4b.4b)
g_aux : t_c_unb2_board_aux := c_unb2_board_aux -- aux contains the hardware version g_aux : t_c_unb2_board_aux := c_unb2_board_aux; -- aux contains the hardware version
g_rom_version: NATURAL := 1;
g_technology : NATURAL := c_tech_arria10
); );
PORT ( PORT (
clk : IN STD_LOGIC; clk : IN STD_LOGIC;
...@@ -82,7 +85,8 @@ BEGIN ...@@ -82,7 +85,8 @@ BEGIN
p_info : PROCESS(cs_sim, hw_version_reg, id_reg) p_info : PROCESS(cs_sim, hw_version_reg, id_reg)
BEGIN BEGIN
nxt_info <= (OTHERS=>'0'); nxt_info(31 DOWNTO 27) <= TO_UVEC(g_technology, 5);
nxt_info(26 DOWNTO 24) <= TO_UVEC(g_rom_version, 3);
nxt_info(23 DOWNTO 20) <= TO_UVEC(g_fw_version.hi, 4); nxt_info(23 DOWNTO 20) <= TO_UVEC(g_fw_version.hi, 4);
nxt_info(19 DOWNTO 16) <= TO_UVEC(g_fw_version.lo, 4); nxt_info(19 DOWNTO 16) <= TO_UVEC(g_fw_version.lo, 4);
nxt_info(10) <= cs_sim; nxt_info(10) <= cs_sim;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
-- --
-- wi Bits R/W Name Default Description |REG_UNB2_BOARD_SYSTEM_INFO| -- wi Bits R/W Name Default Description |REG_UNB2_BOARD_SYSTEM_INFO|
-- ============================================================================= -- =============================================================================
-- 0 [23..0] RO info -- 0 [31..0] RO info
-- 1 [7..0] RO 0 -- 1 [7..0] RO 0
-- 2 [31..0] RO design_name -- 2 [31..0] RO design_name
-- . .. . .. -- . .. . ..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment