From 8a162b337e2eb10892cff82f1e1efa2701a7fefd Mon Sep 17 00:00:00 2001 From: Brian Glod Date: Fri, 9 Feb 2018 13:01:27 -0500 Subject: [PATCH] hdl: build: Remove NiosII/s option Beginning in Quartus 14.0, the NiosII processor split into two versions: Classic and Gen 2. Development of new features for the Classic ceased in Quartus 14.0. Nuand upgraded to the Gen 2 core for the release of the bladeRF micro. The Gen 2 core does not have an option for the Small (NiosII/s) implementation, so the option was removed from the build script. Nuand may add a NiosII/s approximation of the NiosII/f in the future. This will happen quicker if we get requests to do so. :) --- hdl/quartus/build_bladerf.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index 40eaac10..b91a2d2a 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -17,9 +17,9 @@ function usage() echo " -s FPGA size" echo " -a SignalTap STP file" echo " -f Force STP insertion" - echo " -n Select NIOS II revision. Tiny is the" - echo " default and can be built with" - echo " Quartus Web Edition." + echo " -n Select NIOS II Gen 2 core implementation." + echo " Tiny (default) NiosII/e; Compatible with Quartus Web Edition" + echo " Fast NiosII/f; Requires Quartus Standard or Pro Edition" echo " -h Show this text" echo "" @@ -146,7 +146,8 @@ while getopts ":fa:b:s:r:n:h:c" opt; do force="-force" ;; - n) nios_rev=$OPTARG + n) + nios_rev=$OPTARG ;; \?) @@ -220,7 +221,7 @@ if [ "$stp" != "" ] && [ ! -f "$stp" ]; then fi nios_rev=$(echo "$nios_rev" | tr "[:upper:]" "[:lower:]") -if [ "$nios_rev" != "tiny" ] && [ "$nios_rev" != "small" ] && [ "$nios_rev" != "fast" ]; then +if [ "$nios_rev" != "tiny" ] && [ "$nios_rev" != "fast" ]; then echo -e "\nInvalid NIOS II revision: $nios_rev\n" >&2 exit 1 fi @@ -242,16 +243,6 @@ if [ $? -ne 0 ]; then exit 1 fi -# Check compatibility of Nios selection against Quartus version -if [ "$nios_rev" == "small" ] && - [ $(expr ${QUARTUS_VER[major]}\.${QUARTUS_VER[minor]} \>\= 14.1) -eq 1 ]; then - echo "" - echo "NiosII/s (Small) is deprecated as of Quartus 14.1 and later." >&2 - echo "However, it may be approximated with certain configuration options" >&2 - echo "of the NiosII/f." >&2 - exit 1 -fi - nios_system=../fpga/ip/altera/nios_system # 9a484b436: Windows-specific workaround for Quartus bug