From 57c68cc377babb4774a32056c683bc491fc8b5ec Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Tue, 3 Dec 2019 14:58:50 +0100 Subject: [PATCH] working version with revision id string --- boards/uniboard2c/libraries/unb2c_board/quartus/unb2c_board.qsf | 2 +- .../libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd | 2 +- .../unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boards/uniboard2c/libraries/unb2c_board/quartus/unb2c_board.qsf b/boards/uniboard2c/libraries/unb2c_board/quartus/unb2c_board.qsf index b978c76855..bcaa9b0c54 100644 --- a/boards/uniboard2c/libraries/unb2c_board/quartus/unb2c_board.qsf +++ b/boards/uniboard2c/libraries/unb2c_board/quartus/unb2c_board.qsf @@ -312,7 +312,7 @@ if { [info exists ::env(UNB_COMPILE_STAMPS) ] } { set_parameter -name g_stamp_date [clock format [clock seconds] -format {%Y%m%d}] set_parameter -name g_stamp_time [clock format [clock seconds] -format {%H%M%S}] post_message -type info "RADIOHDL: using GIT $::env(HDL_GIT_REVISION_SHORT)" - set_parameter -name g_revision_id [regsub -all {[^0-9]} [exec echo $::env(HDL_GIT_REVISION_SHORT)] ""] + set_parameter -name g_revision_id [regsub -all {[^0-9a-f]} [exec echo $::env(HDL_GIT_REVISION_SHORT)] ""] } #set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to "ctrl_unb2c_board:u_ctrl|eth:\\gen_eth:u_eth|tech_tse:u_tech_tse|tech_tse_arria10_e1sg:\\gen_ip_arria10_e1sg:u0|ip_arria10_e1sg_tse_sgmii_lvds:\\u_LVDS_tse:u_tse|ip_arria10_e1sg_tse_sgmii_lvds_altera_eth_tse_151_6kz2wlq:eth_tse_0|altera_eth_tse_pcs_pma_nf_lvds:i_tse_pcs_0|tbi_tx_d" diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd index 2e9aadefcb..7e40438a50 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd @@ -47,7 +47,7 @@ ENTITY ctrl_unb2c_board IS g_fw_version : t_unb2c_board_fw_version := (0, 0); -- firmware version x.y g_stamp_date : NATURAL := 0; g_stamp_time : NATURAL := 0; - g_revision_id : STRING := "UNUSED"; -- revision_id, commit hash or number + g_revision_id : STRING := ""; -- revision_id, commit hash or number g_design_note : STRING := "UNUSED"; g_base_ip : STD_LOGIC_VECTOR(16-1 DOWNTO 0) := X"0A63"; -- Base IP address used by unb_osy: 10.99.xx.yy g_mm_clk_freq : NATURAL := c_unb2c_board_mm_clk_freq_125M; diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd index 041b89ee6b..2ff374e3e7 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd @@ -34,7 +34,7 @@ ENTITY mms_unb2c_board_system_info IS g_fw_version : t_unb2c_board_fw_version := c_unb2c_board_fw_version; -- firmware version x.y g_stamp_date : NATURAL := 0; g_stamp_time : NATURAL := 0; - g_revision_id : STRING := ""; + g_revision_id : STRING := ""; g_design_note : STRING := ""; g_rom_version : NATURAL := 2; g_aux : t_c_unb2c_board_aux := c_unb2c_board_aux -- aux contains the hardware version -- GitLab