From 35fc6733aead79a4e96dd89435a9304bcf70746a Mon Sep 17 00:00:00 2001 From: Leon Hiemstra <hiemstra@astron.nl> Date: Thu, 21 Apr 2016 15:40:27 +0000 Subject: [PATCH] name change c_ctrl_unb1_version to c_rom_version --- .../libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd | 4 ++-- .../unb1_board/src/vhdl/mms_unb1_board_system_info.vhd | 4 ++-- .../libraries/unb1_board/src/vhdl/unb1_board_system_info.vhd | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd index df8ee88f19..92948e8a5a 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd @@ -254,7 +254,7 @@ END ctrl_unb1_board; ARCHITECTURE str OF ctrl_unb1_board IS - CONSTANT c_ctrl_unb1_version : NATURAL := 1; -- Only increment when something changes to the register map of rom_system_info. + CONSTANT c_rom_version : NATURAL := 1; -- Only increment when something changes to the register map of rom_system_info. -- g_sel=0 for clk200_pll.vhd : used when ADUH is not used so g_dp_phs_clk_vec_w = g_nof_dp_phs_clk = 0 -- g_sel=1 for clk200_pll_p6.vhd : used when ADUH is used so g_dp_phs_clk_vec_w = g_nof_dp_phs_clk > 0 @@ -441,7 +441,7 @@ BEGIN g_stamp_time => g_stamp_time, g_stamp_svn => g_stamp_svn, g_design_note => g_design_note, - g_ctrl_unb1_version => c_ctrl_unb1_version, + g_rom_version => c_rom_version, g_technology => g_technology ) PORT MAP ( diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd index 4ba8f35554..4624cdc3d0 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd @@ -37,7 +37,7 @@ ENTITY mms_unb1_board_system_info IS g_stamp_svn : NATURAL := 0; g_design_note : STRING := ""; g_aux : t_c_unb1_board_aux := c_unb1_board_aux; -- aux contains the hardware version - g_ctrl_unb1_version : NATURAL := 1; + g_rom_version : NATURAL := 1; g_technology : NATURAL := c_tech_stratixiv ); PORT ( @@ -93,7 +93,7 @@ BEGIN GENERIC MAP ( g_sim => g_sim, g_fw_version => g_fw_version, - g_ctrl_unb1_version => g_ctrl_unb1_version, + g_rom_version => g_rom_version, g_technology => g_technology ) PORT MAP ( diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info.vhd index 4811204171..494978911a 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info.vhd @@ -35,7 +35,7 @@ ENTITY unb1_board_system_info IS g_sim : BOOLEAN := FALSE; g_fw_version : t_unb1_board_fw_version := c_unb1_board_fw_version; -- firmware version x.y (4b.4b) g_aux : t_c_unb1_board_aux := c_unb1_board_aux; -- aux contains the hardware version - g_ctrl_unb1_version : NATURAL := 1; + g_rom_version : NATURAL := 1; g_technology : NATURAL := c_tech_stratixiv ); PORT ( @@ -89,7 +89,7 @@ BEGIN p_info : PROCESS(cs_sim, hw_version_reg, id_reg) BEGIN nxt_info(31 DOWNTO 27) <= TO_UVEC(g_technology, 5); - nxt_info(26 DOWNTO 24) <= TO_UVEC(g_ctrl_unb1_version, 3); + 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(19 DOWNTO 16) <= TO_UVEC(g_fw_version.lo, 4); nxt_info(10) <= cs_sim; -- GitLab