Skip to content
Snippets Groups Projects
Commit b2431147 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Work around for unb1_minimal in git. Use g_stamp_svn : INTEGER, to avoid error...

Work around for unb1_minimal in git. Use g_stamp_svn : INTEGER, to avoid error in git, when the svn stamp is not there and yields -1.
parent be0850ac
No related branches found
No related tags found
1 merge request!6Master
...@@ -33,7 +33,7 @@ ENTITY unb1_minimal_qsys IS ...@@ -33,7 +33,7 @@ ENTITY unb1_minimal_qsys IS
g_sim_node_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF
g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF
g_stamp_svn : NATURAL := 0 -- SVN revision -- set by QSF g_stamp_svn : INTEGER := 0 -- SVN revision -- set by QSF
); );
PORT ( PORT (
-- GENERAL -- GENERAL
......
...@@ -33,7 +33,7 @@ ENTITY unb1_minimal_sopc IS ...@@ -33,7 +33,7 @@ ENTITY unb1_minimal_sopc IS
g_sim_node_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF
g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF
g_stamp_svn : NATURAL := 0 -- SVN revision -- set by QSF g_stamp_svn : INTEGER := 0 -- SVN revision -- set by QSF
); );
PORT ( PORT (
-- GENERAL -- GENERAL
......
...@@ -36,7 +36,7 @@ ENTITY unb1_minimal IS ...@@ -36,7 +36,7 @@ ENTITY unb1_minimal IS
g_sim_node_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF
g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF
g_stamp_svn : NATURAL := 0 -- SVN revision -- set by QSF g_stamp_svn : INTEGER := 0 -- SVN revision -- set by QSF
); );
PORT ( PORT (
-- GENERAL -- GENERAL
......
...@@ -52,7 +52,7 @@ ENTITY ctrl_unb1_board IS ...@@ -52,7 +52,7 @@ ENTITY ctrl_unb1_board IS
g_fw_version : t_unb1_board_fw_version := (0, 0); -- firmware version x.y g_fw_version : t_unb1_board_fw_version := (0, 0); -- firmware version x.y
g_stamp_date : NATURAL := 0; g_stamp_date : NATURAL := 0;
g_stamp_time : NATURAL := 0; g_stamp_time : NATURAL := 0;
g_stamp_svn : NATURAL := 0; g_stamp_svn : INTEGER := 0;
g_design_note : STRING := "UNUSED"; g_design_note : STRING := "UNUSED";
g_mm_clk_freq : NATURAL := c_unb1_board_mm_clk_freq_125M; -- default use same MM clock as for TSE clock g_mm_clk_freq : NATURAL := c_unb1_board_mm_clk_freq_125M; -- default use same MM clock as for TSE clock
g_xo_clk_use_pll : BOOLEAN := FALSE; g_xo_clk_use_pll : BOOLEAN := FALSE;
......
...@@ -34,7 +34,7 @@ ENTITY mms_unb1_board_system_info IS ...@@ -34,7 +34,7 @@ ENTITY mms_unb1_board_system_info IS
g_fw_version : t_unb1_board_fw_version := c_unb1_board_fw_version; -- firmware version x.y g_fw_version : t_unb1_board_fw_version := c_unb1_board_fw_version; -- firmware version x.y
g_stamp_date : NATURAL := 0; g_stamp_date : NATURAL := 0;
g_stamp_time : NATURAL := 0; g_stamp_time : NATURAL := 0;
g_stamp_svn : NATURAL := 0; g_stamp_svn : INTEGER := 0;
g_design_note : STRING := ""; g_design_note : STRING := "";
g_aux : t_c_unb1_board_aux := c_unb1_board_aux; -- aux contains the hardware version g_aux : t_c_unb1_board_aux := c_unb1_board_aux; -- aux contains the hardware version
g_rom_version : NATURAL := 1; g_rom_version : NATURAL := 1;
......
...@@ -56,7 +56,7 @@ ENTITY unb1_board_system_info_reg IS ...@@ -56,7 +56,7 @@ ENTITY unb1_board_system_info_reg IS
g_use_phy : t_c_unb1_board_use_phy; g_use_phy : t_c_unb1_board_use_phy;
g_stamp_date : NATURAL := 0; g_stamp_date : NATURAL := 0;
g_stamp_time : NATURAL := 0; g_stamp_time : NATURAL := 0;
g_stamp_svn : NATURAL := 0; g_stamp_svn : INTEGER := 0;
g_design_note : STRING g_design_note : STRING
); );
PORT ( PORT (
...@@ -136,7 +136,7 @@ BEGIN ...@@ -136,7 +136,7 @@ BEGIN
sla_out.rddata(c_word_w-1 DOWNTO 0) <= TO_UVEC(g_stamp_time, c_word_w); sla_out.rddata(c_word_w-1 DOWNTO 0) <= TO_UVEC(g_stamp_time, c_word_w);
ELSIF vA = c_nof_fixed_regs + c_nof_design_name_regs+2 THEN ELSIF vA = c_nof_fixed_regs + c_nof_design_name_regs+2 THEN
sla_out.rddata(c_word_w-1 DOWNTO 0) <= TO_UVEC(g_stamp_svn, c_word_w); sla_out.rddata(c_word_w-1 DOWNTO 0) <= TO_SVEC(g_stamp_svn, c_word_w);
ELSIF vA < c_nof_fixed_regs + c_nof_design_name_regs+c_nof_stamp_regs+c_nof_design_note_regs THEN ELSIF vA < c_nof_fixed_regs + c_nof_design_name_regs+c_nof_stamp_regs+c_nof_design_note_regs THEN
sla_out.rddata(c_word_w-1 DOWNTO 0) <= c_design_note(vA-c_nof_fixed_regs-c_nof_design_name_regs-c_nof_stamp_regs); sla_out.rddata(c_word_w-1 DOWNTO 0) <= c_design_note(vA-c_nof_fixed_regs-c_nof_design_name_regs-c_nof_stamp_regs);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment