diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 56f53000518393b083f828d385ca7116580b57f1..82cdba228fdf70244b5e3c0fa35999be34a32de7 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -516,10 +516,10 @@ function main() {
         install_usrp_uhd_driver $UHD_IMAGES_DIR
       fi
     fi 
-    if [ "$HW" == "OAI_ADRV9371_ZC706" ] ; then
-      echo_info "\nInstalling packages for ADRV9371_ZC706 support"
-      check_install_libiio_driver
-    fi 
+#    if [ "$HW" == "OAI_ADRV9371_ZC706" ] ; then
+#      echo_info "\nInstalling packages for ADRV9371_ZC706 support"
+#      check_install_libiio_driver
+#    fi 
     if [ "$HW" == "OAI_BLADERF" ] ; then
       echo_info "installing packages for BLADERF support"
       check_install_bladerf_driver
@@ -836,9 +836,18 @@ function main() {
 	      echo_info "liboai_device.so is linked to EXMIMO device library"       
 	  elif [ "$HW" == "OAI_ADRV9371_ZC706" ] ; then
 
-        ln -sf $OPENAIR_DIR/targets/ARCH/ADRV9371_ZC706/slib/libadrv9371_zc706.so liboai_device.so
+			SYRIQ_KVER=$(uname -r)
+			SYRIQ_KMAJ=$(echo $SYRIQ_KVER | sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/')
+			SYRIQ_KMIN=$(echo $SYRIQ_KVER | sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/')
+			#echo $SYRIQ_KMAJ$SYRIQ_KMIN
+			if [ "$SYRIQ_KMAJ$SYRIQ_KMIN" == "319" ] || [ "$SYRIQ_KMAJ$SYRIQ_KMIN" == "410" ] || [ "$SYRIQ_KMAJ$SYRIQ_KMIN" == "415" ] ; then
+#				echo "Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN detected"
+				ln -sf /usr/local/lib/syriq/libadrv9371zc706.so liboai_device.so
+			else
+				echo_error "== FAILED == Unexpected Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
+			fi
+			echo_info "liboai_device.so is linked to ADRV9371_ZC706 device library for Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
 
-	      echo_info "liboai_device.so is linked to ADRV9371_ZC706 device library"        
 	  elif [ "$HW" == "OAI_USRP" ] ; then
               compilations \
                   $build_dir oai_usrpdevif \
diff --git a/oaienv b/oaienv
index d9a540697b445bba06e5686718bc0380dabcc44c..4cee684b3d9348e69b1d6f2e0faa2aaa17628d24 100644
--- a/oaienv
+++ b/oaienv
@@ -18,5 +18,6 @@ alias oailte='cd $OPENAIR_TARGETS/RT/USER'
 alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
 alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
 
-export IIOD_REMOTE=192.168.121.32
+#export IIOD_REMOTE=192.168.121.32
+export IIOD_REMOTE=192.168.1.11
 
diff --git a/targets/ARCH/ADRV9371_ZC706/Makefile b/targets/ARCH/ADRV9371_ZC706/Makefile
deleted file mode 100755
index 5684c7b3bc5cb4047512aece1ac652ff0c111725..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#			Creates shared library
-
-CC=			gcc
-CFLAGS+=	-DADRV9371_ZC706 -DHWLAT -O0 -g3 -Wall -fmessage-length=0 -fPIC
-
-DROOT=		./USERSPACE
-DIR=		$(DROOT)/LIB
-
-IFLAGS+=	-I$(DIR)/								\
-			-I$(DROOT)/libini/						\
-			-I../COMMON/							\
-			-I/usr/include/
-
-LDFLAGS+=	-L/usr/lib/x86/64-linux-gnu/			\
-			-lm -liio -ldl -lriffa
-
-OUTDIR=		./slib
-TARGET=		libadrv9371_zc706.so
-
-SRC=		$(DIR)/adrv9371_dump.c					\
-			$(DIR)/adrv9371_helper.c				\
-			$(DIR)/adrv9371_self_test.c				\
-			$(DIR)/adrv9371_zc706_lib.c				\
-			$(DIR)/adrv9371_zc706_riffa_lib.c		\
-			$(DIR)/adrv9371_zc706_stats.c			\
-			$(DIR)/hw_init.c			\
-			$(DROOT)/libini/libini.c
-
-OBJ=		$(OUTDIR)/adrv9371_dump.o				\
-			$(OUTDIR)/adrv9371_helper.o				\
-			$(OUTDIR)/adrv9371_self_test.o			\
-			$(OUTDIR)/adrv9371_zc706_lib.o			\
-			$(OUTDIR)/adrv9371_zc706_riffa_lib.o	\
-			$(OUTDIR)/adrv9371_zc706_stats.o		\
-			$(OUTDIR)/hw_init.o		\
-			$(OUTDIR)/libini.o
-
-all:	lib
-
-dir:
-	mkdir -p $(OUTDIR)
-
-env:
-	set PATH=/usr/lib/:${PATH}
-
-obj:	dir env
-	$(CC) -c $(CFLAGS) $(IFLAGS) $(SRC) 
-	mv *.o $(OUTDIR)
-
-lib:	dir obj
-	$(CC) -shared $(OBJ) -o $(OUTDIR)/$(TARGET) $(LDFLAGS)
-
-# exec: 	env
-#	$(CC) $(CFLAGS) $(IFLAGS) main.c $(SRC) -o lib.exe $(LDFLAGS) -lpthread
-
-.PHONY:	clean
-
-clean:	
-	rm -f $(OUTDIR)/*.o $(OUTDIR)/*~
-
-rm:		clean
-	rm -f $(OUTDIR)/$(TARGET)
-	rmdir $(OUTDIR)
\ No newline at end of file
diff --git a/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme b/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
new file mode 100755
index 0000000000000000000000000000000000000000..46a77ce272832176d97e9805d36935ad2df24bad
--- /dev/null
+++ b/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
@@ -0,0 +1,126 @@
+/* ********** ********** ********** ********** ********** ********** ********** */
+Requirements:
+-------------
+- Previous kernel module/libraries shall be uninstalled !!!
+  - cf. command line below "SYRTEM_IQ_uninstall_previous_SW.sh"
+./SYRTEM_IQ_unload_previous_SW.sh
+- You shall have SYRIQ1.4.6nr.tar.gz
+- Ubuntu kernel version is restricted to:
+  - Kernel 4.15.0-20-lowlatency (Ubuntu 18.04)
+  - Kernel 4.10.0-42-lowlatency (Ubuntu 17.04)
+  - Kernel 3.19.0-61-lowlatency (Ubuntu 14.04)
+- ADRV9371+ZC706 PCIe board shall be switched on
+- PC shall be reboot once ADRV9371+ZC706 PCIe board is switched on
+
+mkdir eur_oai_develop-nr
+cd eur_oai_develop-nr
+
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
+cd openairinterface5g
+
+git checkout 375-syrtem-adrv9371zc706_update
+
+./targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
+-> Reading package lists... Done
+-> Building dependency tree       
+-> Reading state information... Done
+-> linux-headers-4.15.0-20-lowlatency is already the newest version (4.15.0-20.21).
+-> 0 upgraded, 0 newly installed, 0 to remove and 327 not upgraded.
+-> Previous SYRIQ is loaded!
+    -> previous SYRIQ is unloaded!
+    -> previous SYRIQ is uninstall!
+-> Previous SYRIQ uninstallation is done
+
+
+
+
+/* ********** ********** ********** ********** ********** ********** ********** */
+UE:
+---
+configuration:
+--------------
+sudo apt update
+sudo apt-get update
+
+tar -xvzf SYRIQ1.4.6nr.tar.gz
+./SYRIQplatformR1.4.6nr_install.sh
+sudo reboot
+
+sudo lspci -vv | grep Xilinx
+sudo lspci -vv -s 02:00.0 | grep LnkSta
+sudo lspci -vv -s 03:00.0 | grep LnkSta
+sudo lspci -vv -s 02:00.0 | grep Interr
+sudo lspci -vv -s 03:00.0 | grep Interr
+
+sudo gedit /usr/local/etc/syriq/cpu-irq.sh
+echo '1' > /proc/irq/49/smp_affinity_list
+echo '5' > /proc/irq/48/smp_affinity_list
+
+gedit oaienv
+export IIOD_REMOTE=192.168.1.11
+
+
+
+compilation:
+------------
+sudo cset shield --reset
+cd eur_oai_develop-nr/openairinterface5g/
+source oaienv
+
+sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 -I
+sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706
+
+
+
+run:
+----
+source oaienv
+sudo -E /usr/local/etc/syriq/cpu-irq.sh
+
+sudo -E cset shield -e ./targets/bin/nr-uesoftmodem.Rel15 -- --numerology 1 -r 106 -C 3510000000 --loop-memory --rf-config-file /usr/local/etc/syriq/ue.band22.tm1.PRB100.NR40.dat
+
+
+
+
+
+/* ********** ********** ********** ********** ********** ********** ********** */
+gNB:
+----
+configuration:
+--------------
+sudo apt update
+sudo apt-get update
+
+tar -xvzf SYRIQ1.4.6nr.tar.gz
+./SYRIQplatformR1.4.6nr_install.sh
+sudo reboot
+
+sudo lspci -vv | grep Xilinx
+sudo lspci -vv -s 02:00.0 | grep LnkSta
+sudo lspci -vv -s 02:00.0 | grep Interr
+
+sudo gedit /usr/local/etc/syriq/cpu-irq.sh
+echo '1' > /proc/irq/46/smp_affinity_list
+
+gedit oaienv
+export IIOD_REMOTE=192.168.1.21
+
+
+
+compilation:
+------------
+sudo cset shield --reset
+cd eur_oai_develop-nr/openairinterface5g/
+source oaienv
+
+sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 -I
+sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706
+
+
+
+run:
+----
+source oaienv
+sudo -E /usr/local/etc/syriq/cpu-irq.sh
+
+sudo -E cset shield -e ./targets/bin/nr-softmodem.Rel15 -- -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf --rf-config-file /usr/local/etc/syriq/gnb.band22.tm1.PRB100.NR40_hwgain15.dat
diff --git a/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh b/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6651a3beb82e136adbafd221d8659b0fc01b6be5
--- /dev/null
+++ b/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_uninstall_previous_SW.sh
@@ -0,0 +1,28 @@
+# Previous SYRIQ uninstall
+#!/bin/sh
+MODULE="riffa"
+KERNEL_VERSION=$(uname -r)
+RHR=/etc/redhat-release
+
+sudo apt-get install -y --allow-unauthenticated linux-headers-`uname -r`
+
+if lsmod | grep "$MODULE" &> /dev/null ; then
+	echo "Previous SYRIQ is loaded!"
+	sudo rmmod $MODULE
+	echo " -> previous SYRIQ is unloaded!"
+	sudo rm -f /usr/local/lib/libriffa.so*
+	sudo rm -f /usr/local/include/riffa.h
+	sudo rm -f /usr/local/include/riffa_driver.h
+	sudo rm -f /etc/ld.so.conf.d/riffa.conf
+	sudo rm -rf /lib/modules/$KERNEL_VERSION/kernel/drivers/riffa
+	sudo rm -f /etc/udev/rules.d/99-riffa.rules
+	sudo sed -i '/riffa/d' /etc/modules
+	sudo ldconfig
+	sudo depmod
+	echo " -> previous SYRIQ is uninstall!"
+	echo "Previous SYRIQ uninstallation is done"
+	exit 0
+else
+	echo "Previous SYRIQ is not loaded!"
+	exit 1
+fi
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ADRV9371-W_test.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ADRV9371-W_test.ini
deleted file mode 100644
index c1861b2e8dc3314cd3cc1dc5c6e153d01a6c3672..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ADRV9371-W_test.ini
+++ /dev/null
@@ -1,337 +0,0 @@
-[IIO Oscilloscope]
-plugin.DMM.detached=0
-plugin.Debug.detached=0
-plugin.AD9371 Advanced.detached=0
-plugin.AD9371.detached=0
-startup_version_check=0
-test=1
-
-[IIO Oscilloscope - Capture Window1]
-fru_connect = 1
-test.message = Please ensure:\n • 30.72 MHz -> REF_CLK_IN (0dBm)\n • Rx1 <-> Tx1\n • Rx2 <-> Tx2
-domain=fft
-sample_count=400
-fft_size=16384
-fft_avg=8
-fft_pwr_offset=0.000000
-graph_type=Lines
-show_grid=1
-enable_auto_scale=1
-x_axis_min=-67.583626
-x_axis_max=67.576126
-y_axis_min=-130
-y_axis_max=3
-show_capture_options = 1
-
-axi-ad9371-rx-obs-hpc.expanded=1
-axi-ad9371-rx-obs-hpc.active=0
-axi-ad9371-rx-obs-hpc.trigger_enabled=0
-axi-ad9371-rx-obs-hpc.voltage0_i.enabled=0
-axi-ad9371-rx-obs-hpc.voltage0_q.enabled=0
-
-axi-ad9371-rx-hpc.expanded=1
-axi-ad9371-rx-hpc.active=1
-axi-ad9371-rx-hpc.voltage0_i.enabled=1
-axi-ad9371-rx-hpc.voltage0_q.enabled=1
-axi-ad9371-rx-hpc.voltage1_i.enabled=0
-axi-ad9371-rx-hpc.voltage1_q.enabled=0
-
-marker_type = Single Tone Markers
-marker.0 = 9525
-marker.1 = 8192
-marker.2 = 10859
-marker.3 = 12193
-marker.4 = 13526
-marker.5 = 14859
-capture_started=0
-
-[DMM]
-device_list = ad7291 0
-device_list = ad9371-phy 0
-device_list = xadc 0
-running = No
-
-# temp between 20C and 55C (in 0.25C units)
-test.ad7291.in_temp0_raw.int = 80 220
-
-# See the production testing wiki docs [1] for how these values are calculated.
-# [1]: (https://wiki.analog.com/resources/eval/user-guides/ad-fmcomms2-ebz/testing#voltage)
-
-# scale = 0.610351562
-# All nominal voltages +/- 2.5%
-
-# 0 INPUT_VOLTAGE 12V - V(Drop Diode) 56/10
-test.ad7291.in_voltage0_raw.int = 2710 2850
-
-# 1 VOUT2_1V3_DIG 1
-test.ad7291.in_voltage1_raw.int = 2077 2183
-
-# 2 VDD_IF 10/10
-test.ad7291.in_voltage2_raw.int = 1997 2099
-
-# 3 VOUT3_3V3 10/10
-test.ad7291.in_voltage3_raw.int = 2636 2770
-
-# 5 VOUT4_1V8  1
-test.ad7291.in_voltage5_raw.int = 2875 3023
-
-# 7 VOUT1_1V3_ANLG 1
-test.ad7291.in_voltage7_raw.int = 2077 2183
-
-
-# Test AD9528 lock status - Requires 30.720 MHz reference clock!
-test.ad9528-1.pll1_reference_clk_a_present.int = 1 1
-test.ad9528-1.pll1_locked.int = 1 1
-test.ad9528-1.pll2_locked.int = 1 1
-
-
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = INTERNALCALS
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2500000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2600000000
-ad9371-phy.out_voltage1_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 1
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_gain_control_mode = automatic
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = automatic
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2600000000
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 1
-ad9371-phy.out_voltage0_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.ensm_mode = radio_on
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 10001402
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1001265
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 10001402
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 10001402
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 40001860
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1001265
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 10001402
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 40001860
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-dds_mode_tx1 = 0
-dds_mode_tx2 = 0
-SYNC_RELOAD = 1
-
-# test receiver at 1GHz to 5 GHz
-# SEQ FIRST INCREMENT LAST
-<SEQ> i 1000000000 5000000000 5000000000
-
-[IIO Oscilloscope - Capture Window1]
-# wait for device to settle
-marker_type = Peak Markers
-capture_started = 0
-cycle = 1000
-axi-ad9371-rx-hpc.voltage0_i.enabled=1
-axi-ad9371-rx-hpc.voltage0_q.enabled=1
-axi-ad9371-rx-hpc.voltage1_i.enabled=0
-axi-ad9371-rx-hpc.voltage1_q.enabled=0
-cycle = 1000
-
-[AD9371]
-ad9371-phy.out_altvoltage1_TX_LO_frequency = <i>
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = {{<i>} + {100000000}}
-ad9371-phy.out_altvoltage0_RX_LO_frequency = {{<i>} + {100000000}}
-dds_mode_tx1 = 0
-dds_mode_tx2 = 0
-SYNC_RELOAD = 1
-
-[IIO Oscilloscope - Capture Window1]
-# wait for device to settle
-capture_started = 1
-cycle = 3000
-
-[AD9371]
-# channels should be off, so RSSI should be low
-test.ad9371-phy.in_voltage0_rssi.int = 44 45
-test.ad9371-phy.in_voltage1_rssi.int = 44 45
-
-# and gain is high
-test.ad9371-phy.in_voltage0_hardwaregain.double = 30.0 31.0
-test.ad9371-phy.in_voltage0_hardwaregain.double = 30.0 31.0
-
-# set Tx and Rx to be the same
-ad9371-phy.out_altvoltage0_RX_LO_frequency = <i>
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-SYNC_RELOAD = 1
-
-[IIO Oscilloscope - Capture Window1]
-# wait for device to settle
-marker_type = Single Tone Markers
-cycle = 3000
-
-[AD9371]
-
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-
-# channels should be on, so RSSI should be high
-test.ad9371-phy.in_voltage0_rssi.int = 3 12
-test.ad9371-phy.in_voltage1_rssi.int = 3 12
-
-# and gain is low
-test.ad9371-phy.in_voltage0_hardwaregain.double = 15.0 29.0
-test.ad9371-phy.in_voltage0_hardwaregain.double = 15.0 29.0
-
-
-
-[IIO Oscilloscope - Capture Window1]
-cycle = 1000
-capture_started = 1
-cycle = 3000
-save_png = ADRV9371_rx1_<i>.png
-save_markers = markers.log
-
-#look at the markers - Fundamental
-test.marker.0 = -12.0 -4.0
-# DC
-test.marker.1 = -100.0 -60.0
-# 2st Harmonic
-test.marker.2 = -110.0 -75.0
-# 3nd Harmonic
-test.marker.3 = -110.0 -75.0
-# 4th Harmonic
-test.marker.4 = -110.0 -75.0
-# 4th Harmonic
-test.marker.5 = -110.0 -65.0
-
-capture_started = 0
-cycle = 1000
-
-axi-ad9371-rx-hpc.voltage0_i.enabled=0
-axi-ad9371-rx-hpc.voltage0_q.enabled=0
-axi-ad9371-rx-hpc.voltage1_i.enabled=1
-axi-ad9371-rx-hpc.voltage1_q.enabled=1
-
-cycle = 1000
-capture_started = 1
-cycle = 3000
-save_png = ADRV9371_rx2_<i>.png
-save_markers = markers.log
-
-#look at the markers - Fundamental
-test.marker.0 = -12.0 -4.0
-# DC
-test.marker.1 = -100.0 -60.0
-# 2st Harmonic
-test.marker.2 = -110.0 -75.0
-# 3nd Harmonic
-test.marker.3 = -110.0 -75.0
-# 4th Harmonic
-test.marker.4 = -110.0 -75.0
-# 4th Harmonic
-test.marker.5 = -110.0 -65.0
-
-</SEQ>
-
-[IIO Oscilloscope - Capture Window1]
-capture_started = 0
-test.message = Please ensure:\n • ORX1 <-> Tx1\n • ORX22 <-> Tx2
-
-axi-ad9371-rx-hpc.expanded=1
-axi-ad9371-rx-hpc.active=0
-axi-ad9371-rx-hpc.voltage0_i.enabled=0
-axi-ad9371-rx-hpc.voltage0_q.enabled=0
-axi-ad9371-rx-hpc.voltage1_i.enabled=0
-axi-ad9371-rx-hpc.voltage1_q.enabled=0
-
-axi-ad9371-rx-obs-hpc.expanded=1
-axi-ad9371-rx-obs-hpc.active=1
-axi-ad9371-rx-obs-hpc.voltage0_i.enabled=1
-axi-ad9371-rx-obs-hpc.voltage0_q.enabled=1
-cycle = 1000
-
-# test observer path at 1GHz to 5 GHz
-# SEQ FIRST INCREMENT LAST
-<SEQ> i 1000000000 1000000000 5000000000
-
-[AD9371]
-# set Tx and Rx to be the same
-ad9371-phy.out_altvoltage1_TX_LO_frequency = <i>
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = {{<i>} + {1000000}}
-ad9371-phy.out_altvoltage0_RX_LO_frequency = <i>
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-ad9371-phy.out_voltage0_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage1_hardwaregain = -10.000000 dB
-ad9371-phy.in_voltage2_rf_port_select = ORX1_TX_LO
-ad9371-phy.in_voltage2_gain_control_mode = manual
-ad9371-phy.in_voltage2_hardwaregain = 18.000000 dB
-
-[IIO Oscilloscope - Capture Window1]
-capture_started = 1
-cycle = 3000
-save_png = ADRV9371_ob1_<i>.png
-save_markers = markers.log
-
-#look at the markers - Fundamental
-test.marker.0 = -15.0 -5.0
-# DC
-test.marker.1 = -100.0 -75.0
-# 2st Harmonic
-test.marker.2 = -110.0 -75.0
-# 3nd Harmonic
-test.marker.3 = -110.0 -75.0
-# 4th Harmonic
-test.marker.4 = -110.0 -75.0
-# 4th Harmonic
-test.marker.5 = -110.0 -65.0
-
-[AD9371]
-
-ad9371-phy.in_voltage2_rf_port_select = ORX2_TX_LO
-
-
-[IIO Oscilloscope - Capture Window1]
-cycle = 1000
-capture_started = 1
-cycle = 3000
-save_png = ADRV9371_ob2_<i>.png
-save_markers = markers.log
-
-#look at the markers - Fundamental
-test.marker.0 = -15.0 -4.0
-# DC
-test.marker.1 = -100.0 -75.0
-# 2st Harmonic
-test.marker.2 = -110.0 -75.0
-# 3nd Harmonic
-test.marker.3 = -110.0 -75.0
-# 4th Harmonic
-test.marker.4 = -110.0 -75.0
-# 4th Harmonic
-test.marker.5 = -110.0 -65.0
-
-</SEQ>
-
-[IIO Oscilloscope - Capture Window1]
-test.message = All tests passed - Ship it
-quit = 1
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR40.adrv9371-zc706_HWgain15dB.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR40.adrv9371-zc706_HWgain15dB.ini
deleted file mode 100644
index d5b0b8f3b666f76e3ef2a9f5e53e3ebd68cb5678..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR40.adrv9371-zc706_HWgain15dB.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2680000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2560000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2560000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR40MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 46
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR80.adrv9371-zc706_HWgain15dB.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR80.adrv9371-zc706_HWgain15dB.ini
deleted file mode 100644
index 65006f3365481e2ed6300c56c075c2c854329015..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR80.adrv9371-zc706_HWgain15dB.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2680000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2560000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2560000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR80MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 46
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini
deleted file mode 100644
index 63074daad595132a0976959d948c9d50d7b167dd..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2680000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2560000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2560000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = ./targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile20MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 46
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile1-osc.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile1-osc.ini
deleted file mode 100644
index 4282cfffdd1230fd5c9f8f44f87a04a434b8c2b6..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile1-osc.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2685000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2565000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = automatic
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = automatic
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2565000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile_rx30_Tx60_syr.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-debug_mode = 0
-interpolation_decimation_factor = 2
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile20MHz.txt b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile20MHz.txt
deleted file mode 100644
index ac20ab2663cf34f2c4ae2f91c02152c5e15b8c92..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile20MHz.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-<profile AD9371 version=0 name=Rx 20, IQrate 30.720>
- <clocks>
-  <deviceClock_kHz=122880>
-  <clkPllVcoFreq_kHz=9830400>
-  <clkPllVcoDiv=2>
-  <clkPllHsDiv=4>
- </clocks>
-
- <rx>
-  <adcDiv=1>
-  <rxFirDecimation=4>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=2>
-  <iqRate_kHz=30720>
-  <rfBandwidth_Hz=20000000>
-  <rxBbf3dBCorner_kHz=20000>
-
-  <filter FIR gain=-6 num=72>
-  0
-  2
-  4
-  3
-  -4
-  -14
-  -21
-  -12
-  17
-  56
-  73
-  39
-  -53
-  -159
-  -198
-  -101
-  129
-  377
-  457
-  229
-  -274
-  -793
-  -951
-  -482
-  527
-  1564
-  1899
-  1011
-  -978
-  -3154
-  -4109
-  -2611
-  1669
-  7795
-  13807
-  17524
-  17524
-  13807
-  7795
-  1669
-  -2611
-  -4109
-  -3154
-  -978
-  1011
-  1899
-  1564
-  527
-  -482
-  -951
-  -793
-  -274
-  229
-  457
-  377
-  129
-  -101
-  -198
-  -159
-  -53
-  39
-  73
-  56
-  17
-  -12
-  -21
-  -14
-  -4
-  3
-  4
-  2
-  0
-  </filter>
-
-  <adc-profile num=16>
-  599
-  357
-  201
-  98
-  1280
-  112
-  1505
-  53
-  1331
-  21
-  820
-  40
-  48
-  40
-  23
-  191
-  </adc-profile>
- </rx>
-
- <obs>
-  <adcDiv=1>
-  <rxFirDecimation=2>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=2>
-  <iqRate_kHz=61440>
-  <rfBandwidth_Hz=50000000>
-  <rxBbf3dBCorner_kHz=25000>
-
-  <filter FIR gain=0 num=72>
-  0
-  -1
-  1
-  2
-  -2
-  -6
-  6
-  12
-  -13
-  -24
-  25
-  43
-  -45
-  -73
-  77
-  118
-  -124
-  -183
-  193
-  274
-  -289
-  -402
-  423
-  579
-  -607
-  -826
-  866
-  1187
-  -1244
-  -1759
-  1842
-  2818
-  -2970
-  -5815
-  4337
-  18436
-  18436
-  4337
-  -5815
-  -2970
-  2818
-  1842
-  -1759
-  -1244
-  1187
-  866
-  -826
-  -607
-  579
-  423
-  -402
-  -289
-  274
-  193
-  -183
-  -124
-  118
-  77
-  -73
-  -45
-  43
-  25
-  -24
-  -13
-  12
-  6
-  -6
-  -2
-  2
-  1
-  -1
-  0
-  </filter>
-
-  <adc-profile num=16>
-  596
-  358
-  201
-  98
-  1280
-  134
-  1509
-  64
-  1329
-  25
-  818
-  39
-  48
-  40
-  23
-  190
-  </adc-profile>
-
-  <lpbk-adc-profile num=16>
-  599
-  357
-  201
-  98
-  1280
-  112
-  1505
-  53
-  1331
-  21
-  820
-  40
-  48
-  40
-  23
-  191
-  </lpbk-adc-profile>
- </obs>
-
- <tx>
-  <dacDiv=2.5>
-  <txFirInterpolation=2>
-  <thb1Interpolation=2>
-  <thb2Interpolation=2>
-  <txInputHbInterpolation=1>
-  <iqRate_kHz=61440>
-  <primarySigBandwidth_Hz=20000000>
-  <rfBandwidth_Hz=50000000>
-  <txDac3dBCorner_kHz=92000>
-  <txBbf3dBCorner_kHz=25000>
-
-  <filter FIR gain=0 num=32>
-  -118
-  -122
-  242
-  240
-  -429
-  -499
-  730
-  900
-  -1154
-  -1615
-  1742
-  2957
-  -2322
-  -5354
-  3885
-  17211
-  17211
-  3885
-  -5354
-  -2322
-  2957
-  1742
-  -1615
-  -1154
-  900
-  730
-  -499
-  -429
-  240
-  242
-  -122
-  -118
-  </filter>
- </tx>
-</profile>
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR40MHz.txt b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR40MHz.txt
deleted file mode 100644
index 4758e8d4750e65003530e8a3a29435da4c8ba42c..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR40MHz.txt
+++ /dev/null
@@ -1,245 +0,0 @@
-<profile AD9371 version=0 name=Rx 40, IQrate 61.440>
- <clocks>
-  <deviceClock_kHz=122880>
-  <clkPllVcoFreq_kHz=9830400>
-  <clkPllVcoDiv=2>
-  <clkPllHsDiv=4>
- </clocks>
-
- <rx>
-  <adcDiv=1>
-  <rxFirDecimation=2>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=2>
-  <iqRate_kHz=61440>
-  <rfBandwidth_Hz=40000000>
-  <rxBbf3dBCorner_kHz=40000>
-
-  <filter FIR gain=-6 num=72>
-  2
-  0
-  -6
-  -7
-  8
-  20
-  0
-  -39
-  -31
-  46
-  86
-  -12
-  -149
-  -88
-  168
-  253
-  -73
-  -424
-  -188
-  478
-  596
-  -265
-  -1015
-  -326
-  1184
-  1262
-  -778
-  -2301
-  -506
-  2949
-  2877
-  -2404
-  -6653
-  -1392
-  13380
-  26614
-  26614
-  13380
-  -1392
-  -6653
-  -2404
-  2877
-  2949
-  -506
-  -2301
-  -778
-  1262
-  1184
-  -326
-  -1015
-  -265
-  596
-  478
-  -188
-  -424
-  -73
-  253
-  168
-  -88
-  -149
-  -12
-  86
-  46
-  -31
-  -39
-  0
-  20
-  8
-  -7
-  -6
-  0
-  2
-  </filter>
-
-  <adc-profile num=16>
-  599
-  357
-  201
-  98
-  1280
-  112
-  1505
-  53
-  1331
-  21
-  820
-  40
-  48
-  40
-  23
-  191
-  </adc-profile>
- </rx>
-
- <obs>
-  <adcDiv=1>
-  <rxFirDecimation=2>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=1>
-  <iqRate_kHz=122880>
-  <rfBandwidth_Hz=80000000>
-  <rxBbf3dBCorner_kHz=40000>
-
-  <filter FIR gain=0 num=48>
-  1
-  -1
-  -1
-  5
-  1
-  -15
-  7
-  40
-  -34
-  -94
-  102
-  202
-  -242
-  -400
-  500
-  752
-  -943
-  -1370
-  1711
-  2555
-  -3333
-  -6499
-  4207
-  19532
-  19532
-  4207
-  -6499
-  -3333
-  2555
-  1711
-  -1370
-  -943
-  752
-  500
-  -400
-  -242
-  202
-  102
-  -94
-  -34
-  40
-  7
-  -15
-  1
-  5
-  -1
-  -1
-  1
-  </filter>
-
-  <adc-profile num=16>
-  563
-  372
-  201
-  98
-  1280
-  328
-  1550
-  171
-  1317
-  66
-  804
-  33
-  48
-  39
-  23
-  189
-  </adc-profile>
-
-  <lpbk-adc-profile num=16>
-  599
-  357
-  201
-  98
-  1280
-  112
-  1505
-  53
-  1331
-  21
-  820
-  40
-  48
-  40
-  23
-  191
-  </lpbk-adc-profile>
- </obs>
-
- <tx>
-  <dacDiv=2.5>
-  <txFirInterpolation=1>
-  <thb1Interpolation=2>
-  <thb2Interpolation=2>
-  <txInputHbInterpolation=1>
-  <iqRate_kHz=122880>
-  <primarySigBandwidth_Hz=40000000>
-  <rfBandwidth_Hz=40000000>
-  <txDac3dBCorner_kHz=92000>
-  <txBbf3dBCorner_kHz=20000>
-
-  <filter FIR gain=6 num=16>
-  -5
-  425
-  278
-  34
-  -477
-  -1123
-  -1664
-  21975
-  -1664
-  -1123
-  -477
-  34
-  278
-  425
-  -5
-  0
-  </filter>
- </tx>
-</profile>
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR80MHz.txt b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR80MHz.txt
deleted file mode 100644
index 3db078ce388942f427cec06018e9bc8969174122..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR80MHz.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-<profile AD9371 version=0 name=Rx 80, IQrate 122.880>
- <clocks>
-  <deviceClock_kHz=122880>
-  <clkPllVcoFreq_kHz=9830400>
-  <clkPllVcoDiv=2>
-  <clkPllHsDiv=4>
- </clocks>
-
- <rx>
-  <adcDiv=1>
-  <rxFirDecimation=2>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=1>
-  <iqRate_kHz=122880>
-  <rfBandwidth_Hz=80000000>
-  <rxBbf3dBCorner_kHz=80000>
-
-  <filter FIR gain=-6 num=48>
-  1
-  -1
-  -1
-  3
-  -2
-  -11
-  17
-  33
-  -64
-  -83
-  175
-  193
-  -399
-  -414
-  801
-  831
-  -1477
-  -1589
-  2632
-  3042
-  -5102
-  -7664
-  9765
-  32678
-  32678
-  9765
-  -7664
-  -5102
-  3042
-  2632
-  -1589
-  -1477
-  831
-  801
-  -414
-  -399
-  193
-  175
-  -83
-  -64
-  33
-  17
-  -11
-  -2
-  3
-  -1
-  -1
-  1
-  </filter>
-
-  <adc-profile num=16>
-  563
-  372
-  201
-  98
-  1280
-  328
-  1550
-  171
-  1317
-  66
-  804
-  33
-  48
-  39
-  23
-  189
-  </adc-profile>
- </rx>
-
- <obs>
-  <adcDiv=1>
-  <rxFirDecimation=1>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=1>
-  <iqRate_kHz=245760>
-  <rfBandwidth_Hz=160000000>
-  <rxBbf3dBCorner_kHz=80000>
-
-  <filter FIR gain=0 num=24>
-  -62
-  147
-  -188
-  22
-  500
-  -1359
-  2233
-  -2368
-  656
-  2432
-  -9845
-  24506
-  24506
-  -9845
-  2432
-  656
-  -2368
-  2233
-  -1359
-  500
-  22
-  -188
-  147
-  -62
-  </filter>
-
-  <adc-profile num=16>
-  491
-  375
-  201
-  98
-  1280
-  514
-  1728
-  570
-  1455
-  443
-  882
-  27
-  48
-  39
-  25
-  205
-  </adc-profile>
-
-  <lpbk-adc-profile num=16>
-  563
-  372
-  201
-  98
-  1280
-  328
-  1550
-  171
-  1317
-  66
-  804
-  33
-  48
-  39
-  23
-  189
-  </lpbk-adc-profile>
- </obs>
-
- <tx>
-  <dacDiv=2.5>
-  <txFirInterpolation=1>
-  <thb1Interpolation=2>
-  <thb2Interpolation=1>
-  <txInputHbInterpolation=1>
-  <iqRate_kHz=245760>
-  <primarySigBandwidth_Hz=80000000>
-  <rfBandwidth_Hz=80000000>
-  <txDac3dBCorner_kHz=92000>
-  <txBbf3dBCorner_kHz=40000>
-
-  <filter FIR gain=6 num=16>
-  -9
-  505
-  324
-  24
-  -598
-  -1381
-  -2036
-  23360
-  -2036
-  -1381
-  -598
-  24
-  324
-  505
-  -9
-  0
-  </filter>
- </tx>
-</profile>
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile_rx30_Tx60_syr.txt b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile_rx30_Tx60_syr.txt
deleted file mode 100644
index ac20ab2663cf34f2c4ae2f91c02152c5e15b8c92..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile_rx30_Tx60_syr.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-<profile AD9371 version=0 name=Rx 20, IQrate 30.720>
- <clocks>
-  <deviceClock_kHz=122880>
-  <clkPllVcoFreq_kHz=9830400>
-  <clkPllVcoDiv=2>
-  <clkPllHsDiv=4>
- </clocks>
-
- <rx>
-  <adcDiv=1>
-  <rxFirDecimation=4>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=2>
-  <iqRate_kHz=30720>
-  <rfBandwidth_Hz=20000000>
-  <rxBbf3dBCorner_kHz=20000>
-
-  <filter FIR gain=-6 num=72>
-  0
-  2
-  4
-  3
-  -4
-  -14
-  -21
-  -12
-  17
-  56
-  73
-  39
-  -53
-  -159
-  -198
-  -101
-  129
-  377
-  457
-  229
-  -274
-  -793
-  -951
-  -482
-  527
-  1564
-  1899
-  1011
-  -978
-  -3154
-  -4109
-  -2611
-  1669
-  7795
-  13807
-  17524
-  17524
-  13807
-  7795
-  1669
-  -2611
-  -4109
-  -3154
-  -978
-  1011
-  1899
-  1564
-  527
-  -482
-  -951
-  -793
-  -274
-  229
-  457
-  377
-  129
-  -101
-  -198
-  -159
-  -53
-  39
-  73
-  56
-  17
-  -12
-  -21
-  -14
-  -4
-  3
-  4
-  2
-  0
-  </filter>
-
-  <adc-profile num=16>
-  599
-  357
-  201
-  98
-  1280
-  112
-  1505
-  53
-  1331
-  21
-  820
-  40
-  48
-  40
-  23
-  191
-  </adc-profile>
- </rx>
-
- <obs>
-  <adcDiv=1>
-  <rxFirDecimation=2>
-  <rxDec5Decimation=5>
-  <enHighRejDec5=1>
-  <rhb1Decimation=2>
-  <iqRate_kHz=61440>
-  <rfBandwidth_Hz=50000000>
-  <rxBbf3dBCorner_kHz=25000>
-
-  <filter FIR gain=0 num=72>
-  0
-  -1
-  1
-  2
-  -2
-  -6
-  6
-  12
-  -13
-  -24
-  25
-  43
-  -45
-  -73
-  77
-  118
-  -124
-  -183
-  193
-  274
-  -289
-  -402
-  423
-  579
-  -607
-  -826
-  866
-  1187
-  -1244
-  -1759
-  1842
-  2818
-  -2970
-  -5815
-  4337
-  18436
-  18436
-  4337
-  -5815
-  -2970
-  2818
-  1842
-  -1759
-  -1244
-  1187
-  866
-  -826
-  -607
-  579
-  423
-  -402
-  -289
-  274
-  193
-  -183
-  -124
-  118
-  77
-  -73
-  -45
-  43
-  25
-  -24
-  -13
-  12
-  6
-  -6
-  -2
-  2
-  1
-  -1
-  0
-  </filter>
-
-  <adc-profile num=16>
-  596
-  358
-  201
-  98
-  1280
-  134
-  1509
-  64
-  1329
-  25
-  818
-  39
-  48
-  40
-  23
-  190
-  </adc-profile>
-
-  <lpbk-adc-profile num=16>
-  599
-  357
-  201
-  98
-  1280
-  112
-  1505
-  53
-  1331
-  21
-  820
-  40
-  48
-  40
-  23
-  191
-  </lpbk-adc-profile>
- </obs>
-
- <tx>
-  <dacDiv=2.5>
-  <txFirInterpolation=2>
-  <thb1Interpolation=2>
-  <thb2Interpolation=2>
-  <txInputHbInterpolation=1>
-  <iqRate_kHz=61440>
-  <primarySigBandwidth_Hz=20000000>
-  <rfBandwidth_Hz=50000000>
-  <txDac3dBCorner_kHz=92000>
-  <txBbf3dBCorner_kHz=25000>
-
-  <filter FIR gain=0 num=32>
-  -118
-  -122
-  242
-  240
-  -429
-  -499
-  730
-  900
-  -1154
-  -1615
-  1742
-  2957
-  -2322
-  -5354
-  3885
-  17211
-  17211
-  3885
-  -5354
-  -2322
-  2957
-  1742
-  -1615
-  -1154
-  900
-  730
-  -499
-  -429
-  240
-  242
-  -122
-  -118
-  </filter>
- </tx>
-</profile>
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.NR40.adrv9371-zc706.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.NR40.adrv9371-zc706.ini
deleted file mode 100644
index 8dfe8d658917d649a41e52926145f4465e9e4399..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.NR40.adrv9371-zc706.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2560000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2680000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2680000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR40MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 43
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.NR80.adrv9371-zc706.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.NR80.adrv9371-zc706.ini
deleted file mode 100644
index 007499c8ebe935e7534f27ba183f39ee2dde4fa8..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.NR80.adrv9371-zc706.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2560000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2680000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2680000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profileNR80MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 53
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706.ini
deleted file mode 100644
index 34a98d4a7711f30ee9bd1e438f3b0a824a930d5a..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2560000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2680000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 25.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 25.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2680000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile20MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 69
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini
deleted file mode 100644
index e12de4edbe6509a0e31466fd8e7cd514172d412b..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini
+++ /dev/null
@@ -1,89 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = 0.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2560000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2680000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = manual
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 15.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = manual
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2680000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile20MHz.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-# NO_DEBUG=0; DEBUG=1
-debug_mode = 0
-# 20MHz 40MHz 80MHz=1; 10MHz=2; 5MHz=4
-interpolation_decimation_factor = 1
-# is taken into account only if "ad9371-phy.in_voltage0_gain_control_mode = manual"
-rx_gain_offset = 30
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB25.adrv9371-zc706.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB25.adrv9371-zc706.ini
deleted file mode 100644
index bcdbf7716a800c39d02f49961ab1a3c537361d5b..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB25.adrv9371-zc706.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2535000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2655000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = automatic
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = automatic
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2655000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile_rx30_Tx60_syr.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-debug_mode = 0
-interpolation_decimation_factor = 4
diff --git a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB50.adrv9371-zc706.ini b/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB50.adrv9371-zc706.ini
deleted file mode 100644
index a23a765503599ff5486ffa1ad1d380127852b5e7..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB50.adrv9371-zc706.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[AD9371]
-ad9371-phy.in_voltage2_rf_port_select = OFF
-ad9371-phy.in_voltage2_hardwaregain = -156.000000 dB
-ad9371-phy.in_voltage2_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_voltage0_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage0_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage0_quadrature_tracking_en = 1
-ad9371-phy.out_voltage1_hardwaregain = -10.000000 dB
-ad9371-phy.out_voltage1_lo_leakage_tracking_en = 0
-ad9371-phy.out_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage1_TX_LO_frequency = 2535000000
-ad9371-phy.out_altvoltage2_RX_SN_LO_frequency = 2655000000
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage0_gain_control_mode = automatic
-ad9371-phy.in_voltage0_quadrature_tracking_en = 1
-ad9371-phy.in_voltage0_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage0_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.in_voltage1_quadrature_tracking_en = 1
-ad9371-phy.in_voltage1_hardwaregain = 30.000000 dB
-ad9371-phy.in_voltage1_temp_comp_gain = 0.00 dB
-ad9371-phy.in_voltage1_gain_control_mode = automatic
-ad9371-phy.in_voltage_rf_port_select_available = OFF INTERNALCALS OBS_SNIFFER SN_A SN_B SN_C ORX1_TX_LO ORX2_TX_LO ORX1_SN_LO ORX2_SN_LO
-ad9371-phy.out_altvoltage0_RX_LO_frequency = 2655000000
-ad9371-phy.calibrate_rx_qec_en = 0
-ad9371-phy.calibrate_tx_lol_en = 0
-ad9371-phy.calibrate_vswr_en = 0
-ad9371-phy.calibrate_tx_qec_en = 0
-ad9371-phy.calibrate_clgc_en = 0
-ad9371-phy.ensm_mode = radio_on
-ad9371-phy.calibrate_tx_lol_ext_en = 0
-ad9371-phy.calibrate_dpd_en = 0
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage0_TX1_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage5_TX2_I_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage4_TX2_I_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_frequency = 7999809
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage6_TX2_Q_F1_scale = 0.251160
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage3_TX1_Q_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_scale = 0.000000
-axi-ad9371-tx-hpc.out_altvoltage7_TX2_Q_F2_frequency = 1000327
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_phase = 0
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_scale = 0.501160
-axi-ad9371-tx-hpc.out_altvoltage2_TX1_Q_F1_frequency = 1999718
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_frequency = 19998117
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_raw = 1
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_phase = 90000
-axi-ad9371-tx-hpc.out_altvoltage1_TX1_I_F2_scale = 0.000000
-load_myk_profile_file = /targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/profile_rx30_Tx60_syr.txt
-dds_mode_tx1 = 1
-dds_mode_tx2 = 1
-dac_buf_filename = /usr/local/lib/osc/waveforms/LTE20.mat
-tx_channel_0 = 1
-tx_channel_1 = 1
-tx_channel_2 = 0
-tx_channel_3 = 0
-global_settings_show = 1
-tx_show = 1
-rx_show = 1
-obs_show = 1
-fpga_show = 1
-
-[ADRV9371_ZC706]
-debug_mode = 0
-interpolation_decimation_factor = 2
diff --git a/targets/ARCH/ADRV9371_ZC706/readme.txt b/targets/ARCH/ADRV9371_ZC706/readme.txt
deleted file mode 100644
index 05b3bc1b7d90ee2f922b101b96e14f3a321a5942..0000000000000000000000000000000000000000
--- a/targets/ARCH/ADRV9371_ZC706/readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Common command line:
---------------------
-cd /openairinterface5g/
-source oaienv
-
-HWLAT application:
-------------------
-./cmake_targets/build_oai -c -C -w ADRV9371_ZC706 --HWLAT
-./cmake_targets/lte-hwlat/build/lte-hwlat
-
-LTE-SOFTMODEM application:
---------------------------
-./cmake_targets/build_oai -c --eNB --UE --noS1 -w ADRV9371_ZC706
-sudo su
-source oaienv
-source ./targets/bin/init_nas_nos1 UE
-./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C 2680000000 -r100 --ue-scan-carrier --ue-txgain 0 --ue-rxgain 5 -S -A 6 --ue-max-power -25 --phy-test -g 7 --rf-config-file ./targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini
diff --git a/targets/ARCH/ADRV9371_ZC706/slib/libadrv9371_zc706.so b/targets/ARCH/ADRV9371_ZC706/slib/libadrv9371_zc706.so
deleted file mode 100755
index c060bfdc57da7c5213e7b6f4c6b576f28a9cff08..0000000000000000000000000000000000000000
Binary files a/targets/ARCH/ADRV9371_ZC706/slib/libadrv9371_zc706.so and /dev/null differ
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
new file mode 100644
index 0000000000000000000000000000000000000000..258d6c5f03f7169a272d965f9dbb1fa84c4088af
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
@@ -0,0 +1,289 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});	 
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function                                                 = "3GPP_gNODEB";
+      node_timing                                                   = "synch_to_ext_device";
+      node_synch_ref                                                = 0;
+      frame_type                                                    = "FDD";
+      DL_prefix_type                                                = "NORMAL";
+      UL_prefix_type                                                = "NORMAL";
+      eutra_band                                                    = 22;
+      downlink_frequency                                            = 3510000000L;
+      uplink_frequency_offset                                       = -120000000;
+      Nid_cell                                                      = 0;
+      N_RB_DL                                                       = 106;
+      nb_antenna_ports                                              = 1;
+      nb_antennas_tx                                                = 1;
+      nb_antennas_rx                                                = 1;
+      tx_gain                                                       = 90;
+      rx_gain                                                       = 125;
+      MIB_subCarrierSpacingCommon                                   = 30;
+      MIB_ssb_SubcarrierOffset                                      = 0;
+      MIB_dmrs_TypeA_Position                                       = 2;
+      pdcch_ConfigSIB1                                              = 0;
+      SIB1_frequencyOffsetSSB                                       = "khz5";
+      SIB1_ssb_PeriodicityServingCell                               = 5;
+      SIB1_ss_PBCH_BlockPower                                       = -60;
+      absoluteFrequencySSB                                          = 0;
+      DL_FreqBandIndicatorNR                                        = 15;
+      DL_absoluteFrequencyPointA                                    = 15;
+      DL_offsetToCarrier                                            = 15;
+      DL_SCS_SubcarrierSpacing                                      = "kHz30";
+      DL_SCS_SpecificCarrier_k0                                     = 0;
+      DL_carrierBandwidth                                           = 15;
+      DL_locationAndBandwidth                                       = 15;
+      DL_BWP_SubcarrierSpacing                                      = "kHz30";
+      DL_BWP_prefix_type                                            = "NORMAL";
+      UL_FreqBandIndicatorNR                                        = 15;
+      UL_absoluteFrequencyPointA                                    = 13;
+      UL_additionalSpectrumEmission                                 = 3;
+      UL_p_Max                                                      = -1;
+      UL_frequencyShift7p5khz                                       = "TRUE";
+      UL_offsetToCarrier                                            = 10;
+      UL_SCS_SubcarrierSpacing                                      = "kHz30";
+      UL_SCS_SpecificCarrier_k0                                     = 0;
+      UL_carrierBandwidth                                           = 15;
+      UL_locationAndBandwidth                                       = 15;
+      UL_BWP_SubcarrierSpacing                                      = "kHz30";
+      UL_BWP_prefix_type                                            = "NORMAL";
+      UL_timeAlignmentTimerCommon                                   = "infinity";
+      ServingCellConfigCommon_n_TimingAdvanceOffset                 = "n0"
+      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = "shortBitmap";
+      ServingCellConfigCommon_ssb_periodicityServingCell            = 10;
+      ServingCellConfigCommon_dmrs_TypeA_Position                   = 2;
+      NIA_SubcarrierSpacing                                         = "kHz15"; 
+      ServingCellConfigCommon_ss_PBCH_BlockPower                    = -60;
+      referenceSubcarrierSpacing                                    = "kHz15";
+      dl_UL_TransmissionPeriodicity                                 = "ms0p5";
+      nrofDownlinkSlots                                             = 10;
+      nrofDownlinkSymbols                                           = 10;
+      nrofUplinkSlots                                               = 10;
+      nrofUplinkSymbols                                             = 10;
+      rach_totalNumberOfRA_Preambles                                = 63;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice         = "oneEighth";
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneEighth      = 4;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneFourth      = 8;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneHalf        = 16;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_one            = 24;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_two            = 32;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_four           = 8;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_eight          = 4;
+      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_sixteen        = 2;
+      rach_groupBconfigured                                         = "ENABLE";
+      rach_ra_Msg3SizeGroupA                                        = 56;
+      rach_messagePowerOffsetGroupB                                 = "dB0";
+      rach_numberOfRA_PreamblesGroupA                               = 32;
+      rach_ra_ContentionResolutionTimer                             = 8;
+      rsrp_ThresholdSSB                                             = 64;
+      rsrp_ThresholdSSB_SUL                                         = 64;
+      prach_RootSequenceIndex_choice                                = "l839";
+      prach_RootSequenceIndex_l839                                  = 0;
+      prach_RootSequenceIndex_l139                                  = 0;
+      prach_msg1_SubcarrierSpacing                                  = "kHz30";
+      restrictedSetConfig                                           = "unrestrictedSet";
+      msg3_transformPrecoding                                       = "ENABLE";
+      prach_ConfigurationIndex                                      = 10;
+      prach_msg1_FDM                                                = "one";
+      prach_msg1_FrequencyStart                                     = 10;
+      zeroCorrelationZoneConfig                                     = 10;
+      preambleReceivedTargetPower                                   = -150;
+      preambleTransMax                                              = 6;
+      powerRampingStep                                              = "dB0";
+      ra_ResponseWindow                                             = 8;
+      groupHoppingEnabledTransformPrecoding                         = "ENABLE";
+      msg3_DeltaPreamble                                            = 0;
+      p0_NominalWithGrant                                           = 0;
+      PUSCH_TimeDomainResourceAllocation_k2                         = 0;
+      PUSCH_TimeDomainResourceAllocation_mappingType                = "typeA";
+      PUSCH_TimeDomainResourceAllocation_startSymbolAndLength       = 0;
+      pucch_ResourceCommon                                          = 0;
+      pucch_GroupHopping                                            = "neither";
+      hoppingId                                                     = 0;
+      p0_nominal                                                    = -30;
+      PDSCH_TimeDomainResourceAllocation_k0                         = 2;
+      PDSCH_TimeDomainResourceAllocation_mappingType                = "typeA";
+      PDSCH_TimeDomainResourceAllocation_startSymbolAndLength       = 0;
+      rateMatchPatternId                                            = 0;
+      RateMatchPattern_patternType                                  = "bitmaps";
+      symbolsInResourceBlock                                        = "oneSlot";
+      periodicityAndPattern                                         = 2;
+      RateMatchPattern_controlResourceSet                           = 5;
+      RateMatchPattern_subcarrierSpacing                            = "kHz30";
+      RateMatchPattern_mode                                         = "dynamic";
+      controlResourceSetZero                                        = 0;
+      searchSpaceZero                                               = 0;
+      searchSpaceSIB1                                               = 10;
+      searchSpaceOtherSystemInformation                             = 10;
+      pagingSearchSpace                                             = 10;
+      ra_SearchSpace                                                = 10;
+      PDCCH_common_controlResourceSetId                             = 5;
+      PDCCH_common_ControlResourceSet_duration                      = 2;
+      PDCCH_cce_REG_MappingType                                     = "nonInterleaved";
+      PDCCH_reg_BundleSize                                          = 3;
+      PDCCH_interleaverSize                                         = 3;
+      PDCCH_shiftIndex                                              = 10;  
+      PDCCH_precoderGranularity                                     = "sameAsREG-bundle";
+      PDCCH_TCI_StateId                                             = 32;
+      tci_PresentInDCI                                              = "ENABLE";
+      PDCCH_DMRS_ScramblingID                                       = 0;
+      SearchSpaceId                                                 = 10;
+      commonSearchSpaces_controlResourceSetId                       = 5;
+      SearchSpace_monitoringSlotPeriodicityAndOffset_choice         = "sl1";
+      SearchSpace_monitoringSlotPeriodicityAndOffset_value          = 0;
+      SearchSpace_duration                                          = 2;
+      SearchSpace_nrofCandidates_aggregationLevel1                  = 0;
+      SearchSpace_nrofCandidates_aggregationLevel2                  = 0;
+      SearchSpace_nrofCandidates_aggregationLevel4                  = 0;
+      SearchSpace_nrofCandidates_aggregationLevel8                  = 0;
+      SearchSpace_nrofCandidates_aggregationLevel16                 = 0;
+      SearchSpace_searchSpaceType                                   = "common";
+      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel1     = 1;
+      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel2     = 1;
+      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel4     = 1;
+      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel8     = 1;
+      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel16    = 1; 
+      Common_dci_Format2_3_monitoringPeriodicity                    = 1;
+      Common_dci_Format2_3_nrofPDCCH_Candidates                     = 1;
+      ue_Specific__dci_Formats                                      = "formats0-0-And-1-0";
+      RateMatchPatternLTE_CRS_carrierFreqDL                         = 6;
+      RateMatchPatternLTE_CRS_carrierBandwidthDL                    = 6;
+      RateMatchPatternLTE_CRS_nrofCRS_Ports                         = 1;
+      RateMatchPatternLTE_CRS_v_Shift                               = 0;
+      RateMatchPatternLTE_CRS_radioframeAllocationPeriod            = 1;
+      RateMatchPatternLTE_CRS_radioframeAllocationOffset            = 0;
+      RateMatchPatternLTE_CRS_subframeAllocation_choice             = "oneFrame";
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	tr_s_preference = "local_L1";
+	tr_n_preference = "local_RRC";
+        }  
+);
+
+L1s = (
+    	{
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+        }  
+);
+
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 1
+         nb_rx          = 1
+         att_tx         = 0
+         att_rx         = 0;
+         bands          = [7];
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 114;
+         eNB_instances  = [0];
+	 sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2,mgmt_addr=192.168.100.8";
+
+    }
+);  
+
+NETWORK_CONTROLLER :
+{
+    FLEXRAN_ENABLED        = "no";
+    FLEXRAN_INTERFACE_NAME = "lo";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
+    FLEXRAN_PORT           = 2210;
+    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
+    FLEXRAN_AWAIT_RECONF   = "no";
+};
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       global_log_verbosity                  ="medium";
+       hw_log_level                          ="info";
+       hw_log_verbosity                      ="medium";
+       phy_log_level                         ="info";
+       phy_log_verbosity                     ="medium";
+       mac_log_level                         ="info";
+       mac_log_verbosity                     ="high";
+       rlc_log_level                         ="info";
+       rlc_log_verbosity                     ="medium";
+       pdcp_log_level                        ="info";
+       pdcp_log_verbosity                    ="medium";
+       rrc_log_level                         ="info";
+       rrc_log_verbosity                     ="medium";
+    };
+
diff --git a/targets/RT/USER/lte-hwlat.c b/targets/RT/USER/lte-hwlat.c
index 9f5a3306aa20128cd856e7c416cc2318688d7a62..3fb4b0e99e81fed1b9de871a58b72d354dc91ed6 100755
--- a/targets/RT/USER/lte-hwlat.c
+++ b/targets/RT/USER/lte-hwlat.c
@@ -57,9 +57,9 @@
 #include "LAYER2/MAC/extern.h"
 #include "LAYER2/MAC/proto.h"
 
-#define 		RIFFA_CHANNEL_TESTER  0
-#define 		RIFFA_CHANNEL_TESTER2 0
-#define     RIFFA_CHANNEL_DATA1   1
+#define 		SYRIQ_CHANNEL_TESTER  0
+#define 		SYRIQ_CHANNEL_TESTER2 0
+#define     SYRIQ_CHANNEL_DATA1   1
 
 volatile int             oai_exit = 0;
 
@@ -346,7 +346,7 @@ int main(void)
 	int 				c 				= 0;
 	int 				numIter			= 0;
 	int 				fpga_loop		= 0;
-#if RIFFA_CHANNEL_DATA1
+#if SYRIQ_CHANNEL_DATA1
 	uint64_t			first_ts		= 0;
 	uint8_t				is_first_ts		= 0;
 	uint64_t			trx_read_cnt	= 0;
@@ -383,7 +383,7 @@ int main(void)
 #endif
 
   const char *openair_dir = getenv("OPENAIR_DIR");
-  const char *ini_file		= "/targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/ue.band7.tm1.PRB100.adrv9371-zc706_HWgain15dB.ini";
+  const char *ini_file    = "/usr/local/etc/syriq/ue.band7.tm1.PRB100.NR20.dat";
 
   int   readBlockSize;
   void* rxp[nb_antennas_rx];
@@ -726,9 +726,9 @@ int main(void)
 //#endif
 
 /* ********** ********** */
-/*  RIFFA_CHANNEL_DATA1  */
+/*  SYRIQ_CHANNEL_DATA1  */
 /* ********** ********** */
-#if RIFFA_CHANNEL_DATA1
+#if SYRIQ_CHANNEL_DATA1
 
 //  rf_device.trx_get_stats_func( &rf_device );
 
@@ -766,12 +766,12 @@ int main(void)
 //      break;
 //    }
 //  }
-	printf("RIFFA CHANNEL DATA1 done !!!\n");
+	printf("SYRIQ CHANNEL DATA1 done !!!\n");
   sleep(1);
 	return(0);
 #endif
 /* ********** ********** */
-/*  RIFFA_CHANNEL_DATA1  */
+/*  SYRIQ_CHANNEL_DATA1  */
 /* ********** ********** */
 
 
@@ -809,9 +809,9 @@ int main(void)
 		if (ret > 0)
 		{
 /* ********** ********** */
-/*  RIFFA_CHANNEL_TESTER */
+/*  SYRIQ_CHANNEL_TESTER */
 /* ********** ********** */
-#if RIFFA_CHANNEL_TESTER
+#if SYRIQ_CHANNEL_TESTER
       failure = 0;
 			for (i = 0; i < ret; i++)
 			{
@@ -843,9 +843,9 @@ int main(void)
       			}
 #endif
 /* ********** ********** */
-/*  RIFFA_CHANNEL_TESTER2*/
+/*  SYRIQ_CHANNEL_TESTER2*/
 /* ********** ********** */
-#if RIFFA_CHANNEL_TESTER2
+#if SYRIQ_CHANNEL_TESTER2
 //			printf("* ret=%d timestamp=%ld (%ld)\n", ret, timestamp, (timestamp%307200));
       failure = 0;
 			for (i = 0; i < ret; i++)
diff --git a/targets/RT/USER/nr-softmodem.c b/targets/RT/USER/nr-softmodem.c
index 481386a7c8d7215e7512f5c4a7a852e8d72dee54..8b5b7f6e28db6724234d1e4620f96433f39abb97 100644
--- a/targets/RT/USER/nr-softmodem.c
+++ b/targets/RT/USER/nr-softmodem.c
@@ -164,7 +164,7 @@ double bw = 10.0e6;
 
 static int                      tx_max_power[MAX_NUM_CCs]; /* =  {0,0}*/;
 
-char   rf_config_file[1024]="./targets/ARCH/ADRV9371_ZC706/USERSPACE/PROFILES/gnb.band7.tm1.PRB100.NR40.adrv9371-zc706_HWgain15dB.ini";
+char   rf_config_file[1024]="/usr/local/etc/syriq/ue.band7.tm1.PRB100.NR40.dat";
 
 int chain_offset=0;
 int phy_test = 0;