From b24311471fcaee33cac4539909df3a58f67a5b14 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Wed, 12 Feb 2020 14:44:12 +0100
Subject: [PATCH] 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.
---
.../revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd | 2 +-
.../revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd | 2 +-
.../uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd | 2 +-
.../libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd | 2 +-
.../unb1_board/src/vhdl/mms_unb1_board_system_info.vhd | 2 +-
.../unb1_board/src/vhdl/unb1_board_system_info_reg.vhd | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd
index 7d773cb4b5..13e9851683 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd
@@ -33,7 +33,7 @@ ENTITY unb1_minimal_qsys IS
g_sim_node_nr : NATURAL := 0;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- 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 (
-- GENERAL
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd
index f9c05be852..a34407ad49 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd
@@ -33,7 +33,7 @@ ENTITY unb1_minimal_sopc IS
g_sim_node_nr : NATURAL := 0;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- 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 (
-- GENERAL
diff --git a/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd b/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd
index ea6ede3610..07df2214db 100644
--- a/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd
+++ b/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd
@@ -36,7 +36,7 @@ ENTITY unb1_minimal IS
g_sim_node_nr : NATURAL := 0;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- 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 (
-- GENERAL
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 2766d5fe86..bbaa9e82c3 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
@@ -52,7 +52,7 @@ ENTITY ctrl_unb1_board IS
g_fw_version : t_unb1_board_fw_version := (0, 0); -- firmware version x.y
g_stamp_date : NATURAL := 0;
g_stamp_time : NATURAL := 0;
- g_stamp_svn : NATURAL := 0;
+ g_stamp_svn : INTEGER := 0;
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_xo_clk_use_pll : BOOLEAN := FALSE;
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 4624cdc3d0..3e1a8c454e 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
@@ -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_stamp_date : NATURAL := 0;
g_stamp_time : NATURAL := 0;
- g_stamp_svn : NATURAL := 0;
+ g_stamp_svn : INTEGER := 0;
g_design_note : STRING := "";
g_aux : t_c_unb1_board_aux := c_unb1_board_aux; -- aux contains the hardware version
g_rom_version : NATURAL := 1;
diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd
index c16da3f61d..f22b7364ce 100644
--- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd
+++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd
@@ -56,7 +56,7 @@ ENTITY unb1_board_system_info_reg IS
g_use_phy : t_c_unb1_board_use_phy;
g_stamp_date : NATURAL := 0;
g_stamp_time : NATURAL := 0;
- g_stamp_svn : NATURAL := 0;
+ g_stamp_svn : INTEGER := 0;
g_design_note : STRING
);
PORT (
@@ -136,7 +136,7 @@ BEGIN
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
- 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
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);
--
GitLab