Merge branch 'L2SDP-187' into 'master'

Resolve L2SDP-187

Closes L2SDP-187

See merge request desp/hdl!63

applications/ta2/libraries/ta2_unb2b_bsp/board_env.xml → applications/ta2/bsp/board_env.xml

 <?xml version="1.0"?>
 <board_env version="18.0" name="ta2_unb2b_bsp">
-  <hardware dir="hardware" default="unb2b"></hardware>
+  <hardware dir="hardware" default="ta2_unb2b_bsp"></hardware>
   <platform name="linux64">
     <mmdlib>%b/linux64/lib/libaltera_a10_ref_mmd.so</mmdlib>
     <linkflags>-L%b/linux64/lib</linkflags>

applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/board_spec.xml → applications/ta2/bsp/hardware/ta2_unb2b_bsp/board_spec.xml

 <?xml version="1.0"?>
-<board version="18.0" name="unb2b">
+<board version="19.2" name="ta2_unb2b_bsp">
 
   <compile name="flat" project="top" revision="flat" qsys_file="none" generic_kernel="1">
-    <generate cmd="quartus_sh -t scripts/pre_flow_pr.tcl flat"/>
+    <generate cmd="quartus_sh -t scripts/pre_flow_pr.tcl ta2_unb2b_bsp"/>
     <synthesize cmd="quartus_sh --flow compile top -c flat"/>
     <auto_migrate platform_type="a10_ref" >
       <include fixes=""/>

applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/flat.qsf → applications/ta2/bsp/hardware/ta2_unb2b_bsp/flat.qsf

@@ -14,17 +14,35 @@
 # sole purpose of programming logic devices manufactured by Intel and sold by    
 # Intel or its authorized distributors.  Please refer to the applicable          
 # agreement for further details.                                                 
-
+# ##########################################################################
+# Copyright 2020
+# ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/>
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ##########################################################################
+
+# ##########################################################################
+# Author:
+# . Reinier vd Walle
+# Purpose:
+# . Quartus settings for OpenCL BSP
+# Description:
+# . " "
+# ##########################################################################
 
 # device.tcl contains settings unique to each device type/board variant (most importantly, the device string for the particular device type)
 source device.tcl
-source ctrl_unb2_board.tcl
-source ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.tcl
-source ip/ta2_unb2b_1GbE_mc/ta2_unb2b_1GbE_mc.tcl
-source ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.tcl
-source ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.tcl
-source ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.tcl
-source ip/ta2_unb2b_ddr/ta2_unb2b_ddr.tcl
 #============================================================
 # Files and basic settings
 #============================================================

applications/ta2/libraries/ta2_unb2b_bsp/hardware/unb2b/hdllib.cfg → applications/ta2/bsp/hardware/ta2_unb2b_bsp/hdllib.cfg

-hdl_lib_name = ta2_unb2b_top
-hdl_library_clause_name = ta2_unb2b_top_lib
-hdl_lib_uses_synth = common technology dp unb2b_board ta2_unb2b_40GbE ta2_unb2b_10GbE ta2_unb2b_1GbE_mc ta2_unb2b_jesd204b ta2_unb2b_mm_io #ta2_unb2b_ddr 
+hdl_lib_name = ta2_unb2b_bsp
+hdl_library_clause_name = ta2_unb2b_bsp_lib
+hdl_lib_uses_synth = common technology dp unb2b_board ta2_unb2b_40GbE ta2_unb2b_10GbE ta2_unb2b_1GbE_mc ta2_unb2b_jesd204b ta2_unb2b_mm_io ta2_unb2b_ddr 
 hdl_lib_uses_sim = 
 hdl_lib_technology = ip_arria10_e1sg
 hdl_lib_include_ip = 
 
 synth_files =
   top_components_pkg.vhd
-  ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.vhd
-  ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.vhd
-  ip/ta2_unb2b_1GbE_mc/ta2_unb2b_1GbE_mc.vhd
-  ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.vhd
-  ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd
-#  ip/ta2_unb2b_ddr/ta2_unb2b_ddr.vhd
+  ip/pr_region.v
+  ip/freeze_wrapper.v
   top.vhd
+
 test_bench_files =     
 
 regression_test_vhdl = 
@@ -24,6 +21,7 @@ regression_test_vhdl =
 synth_top_level_entity =
 
 quartus_copy_files =
+   ./ . 
     
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard2b/libraries/unb2b_board/quartus/unb2b_board.qsf
@@ -38,5 +36,9 @@ quartus_vhdl_files =
 
 quartus_qip_files =
 
+quartus_ip_files = 
+    $RADIOHDL_BUILD_DIR/unb2b/quartus/ta2_unb2b_40GbE/arria10_40g_mac.ip
+    $RADIOHDL_BUILD_DIR/unb2b/quartus/ta2_unb2b_40GbE/arria10_40g_atx_pll.ip
+
 nios2_app_userflags = -DCOMPILE_FOR_GEN2_UNB2