diff --git a/applications/apertif/doc/apertif_fpga_firmware_overview_erko.txt b/applications/apertif/doc/apertif_fpga_firmware_overview_erko.txt index 512b4840291d9e960d2657ea8acb140c9cc4deae..2b53e5a0f25b84ad444678b2681ae49297eafc86 100755 --- a/applications/apertif/doc/apertif_fpga_firmware_overview_erko.txt +++ b/applications/apertif/doc/apertif_fpga_firmware_overview_erko.txt @@ -5,6 +5,7 @@ $RADIOHDL/applications/apertif/designs/ > cd $RADIOHDL/libraries/technology/ip_stratixiv > ./generate-all-ip.sh + 2) Revisions: "apertif_unb1_bn_filterbank" = apertif_unb1_bn_filterbank/src/vhdl/apertif_unb1_bn_filterbank.vhd "apertif_unb1_fn_beamformer_trans" = apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_transpose/apertif_unb1_fn_beamformer_transpose.vhd @@ -15,20 +16,12 @@ $RADIOHDL/applications/apertif/designs/ apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_nodes.vhd + 3) MMM sopc_apertif_unb1_bn_filterbank instantiated in mmm as entity sopc_apertif_unb1_fn_beamformer instantiated in mmm as entity qsys_apertif_unb1_correlator instantiated in mmm as component - Arts: - > run_sopc unb1 apertif_unb1_fn_bf_emu - > run_qsys unb1 arts_unb1_sc1 - - Apertif: - > run_sopc unb1 apertif_unb1_bn_filterbank - > run_sopc unb1 apertif_unb1_fn_beamformer_trans - > run_qsys unb1 apertif_unb1_correlator_full - MMM automation is still in trial status, so not used for applications yet: * DS: base/generate_qsys.py creats a *.sys file from a template and a register list components/mm_master.py @@ -40,9 +33,21 @@ $RADIOHDL/applications/apertif/designs/ 4) Build: > python $RADIOHDL/tools/oneclick/base/modelsim_config.py -t unb1 > python $RADIOHDL/tools/oneclick/base/quartus_config.py -t unb1 + + Arts: + > run_sopc unb1 apertif_unb1_fn_bf_emu + > run_qsys unb1 arts_unb1_sc1 + + Apertif: + > run_sopc unb1 apertif_unb1_bn_filterbank + > run_sopc unb1 apertif_unb1_fn_beamformer_trans + > run_qsys unb1 apertif_unb1_correlator_full + + Run qsys_delete_duplicates_*.sh to avoid ambigious duplicate source file error with QSYS in Quartus: + > cd $RADIOHDL/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_full + > ./qsys_delete_duplicates_full.sh + > cd $RADIOHDL - Run qsys_delete_duplicates_*.sh - ./applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_full/qsys_delete_duplicates_full.sh 5) Simulate @@ -53,6 +58,7 @@ $RADIOHDL/applications/apertif/designs/ > mk all > lp apertif_unb1_correlator > mk all + 6) Synthesis python ~/svnroot/UniBoard_FP7/RadioHDL/trunk/tools/oneclick/base/quartus_config.py -t unb1 @@ -72,3 +78,58 @@ $RADIOHDL/applications/apertif/designs/ ls ll + + +7) SVN branching + + mkdir branches + svn add branches/ + commit -m "Start branching." branches/ + svn info . + # The ^ is the root of the repository in SVN + svn ls ^/RadioHDL + + # Define simple editor for SVN commit message editing + export SVN_EDITOR=vim + echo $SVN_EDITOR + + # Create branch from revison 16579 of the trunk and call it Task_<Redmine issue number> + # Start the commit message with Task #<Redmine issue number>: to provide link for Redmine. + # Optinal use r<SVN revision number> in the commit message + + svn cp ^/RadioHDL/trunk@16579 ^/RadioHDL/branches/Task_1275 + cd branches + svn up Task_1275 + + rbf:17728 resynthesis of Hajee image 16579 on Task_1275 branch works OK. + + cd ~/svnroot/UniBoard_FP7/RadioHDL/branches/Task_1275 + diff -r . ../../trunk_hajee # shows diff inside files + diff -rq . ../../trunk_hajee # quiet, shows only diff files names + + cntr-alt-F1 + killall -9 gvimdiff + cntr-alt-F7 + + cd ../branches/Task_1275/ + svn log -v -r 16588:HEAD ^/RadioHDL/trunk | more + svn merge -c 16592 ^/RadioHDL/trunk # merge changes + svn merge -r 16596:16658 ^/RadioHDL/trunk # merge a range of revisions + svn diff --diff-cmd diff # toont Merged /RadioHDL/trunk:r16580-16592 + +8) To do: + - ppsh.vhd decrease c_pipeline_output : NATURAL := 100; + +9) Task_1275 + Possible suspects: WPFB, ADUH, node, PPSH, DP + r 17739 : Merged /RadioHDL/trunk:r16580-16658 and compaan stuff + r ..... : Merged technology, base, io (so including ppsh, aduh) + > cd technology + > svn merge ^/RadioHDL/trunk/libraries/technology + > cd base + > svn merge ^/RadioHDL/trunk/libraries/base + > cd io + > svn merge ^/RadioHDL/trunk/libraries/io + + + \ No newline at end of file