diff --git a/cmake_targets/build_oai.bash b/cmake_targets/build_oai.bash index ac4f2fa29014041be82e3a8d6f063d6d5fd767a8..a146ed2bb45bdd00e39d45496acdbde92f41845e 100755 --- a/cmake_targets/build_oai.bash +++ b/cmake_targets/build_oai.bash @@ -233,7 +233,7 @@ if [ "$TARGET" = "ALL" -o "$TARGET" = "SOFTMODEM" ] ; then make -j4 $f > $log 2>&1 if [ -s $f ] ; then echo_success "$f compiled" - cp $f $OPENAIR_DIR/cmake_targets/tests/bin + cp $f $OPENAIR_DIR/cmake_targets/bin else echo_error "$f compilation failed" fi diff --git a/cmake_targets/init_exmimo2.sh b/cmake_targets/init_exmimo2.sh new file mode 100755 index 0000000000000000000000000000000000000000..9d7d91d1fb129cc2701fc9f468282a7fb95927e9 --- /dev/null +++ b/cmake_targets/init_exmimo2.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +PCI=`lspci -m | grep Xilinx` +if [ -z "$PCI" ]; then + echo "No card found. Stopping!" + return +fi + +## This part corrects the wrong configuration of the endpoint done by the bios in some machines +echo "$PCI" | while read config_reg; do +SLOT_NUMBER=`echo $config_reg | awk -F\" '{print $1}'` +sudo setpci -s $SLOT_NUMBER 60.b=10 +done + +load_module() { + mod_name=${1##*/} + mod_name=${mod_name%.*} + if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules + then + echo "module $mod_name already loaded: I remove it first" + sudo rmmod $mod_name + fi + echo loading $mod_name + sudo insmod $1 +} + +load_module $OPENAIR_DIR/cmake_targets/bin/openair_rf.ko +sleep 1 + +if [ ! -e /dev/openair0 ]; then + sudo mknod /dev/openair0 c 127 0 + sudo chmod a+rw /dev/openair0 +fi + +DEVICE=`echo $PCI | awk -F\" '{print $(NF-1)}' | awk '{print $2}'` +DEVICE_SWID=${DEVICE:2:2} +if [ $DEVICE_SWID == '0a' ]; then + echo "Using firware version 10" + $OPENAIR_DIR/cmake_targets/bin/updatefw -s 0x43fffff0 -b -f $OPENAIR_TARGETS/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT/sdr_expressmimo2_v10 +else + echo 'No corresponding firmware found' + return +fi + +load_module $OPENAIR_DIR/cmake_targets/bin/nasmesh.ko + +if [ "$1" = "eNB" ]; then + echo "bring up oai0 interface for enb" + sudo ifconfig oai0 10.0.1.1 netmask 255.255.255.0 broadcast 10.0.1.255 + $OPENAIR2_DIR/NAS/DRIVER/MESH/RB_TOOL/rb_tool -a -c0 -i0 -z0 -s 10.0.1.1 -t 10.0.1.9 -r 1 +else + if [ "$1" = "UE" ]; then + echo "bring up oai0 interface for UE" + sudo ifconfig oai0 10.0.1.9 netmask 255.255.255.0 broadcast 10.0.1.255 + $OPENAIR2_DIR/NAS/DRIVER/MESH/RB_TOOL/rb_tool -a -c0 -i0 -z0 -s 10.0.1.9 -t 10.0.1.1 -r 1 + fi +fi diff --git a/cmake_targets/lte_build_oai/CMakeLists.txt b/cmake_targets/lte_build_oai/CMakeLists.txt index ca5842c78dea918e4a3591848ca4e9b439e17817..3608c1a7bb7627e131adad0dca461d1674854f32 100644 --- a/cmake_targets/lte_build_oai/CMakeLists.txt +++ b/cmake_targets/lte_build_oai/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) set(XFORMS 1 ) -set(RRC_ASN1_VERSION "Rel8") +set(RRC_ASN1_VERSION "Rel10") set(ENABLE_VCD_FIFO False ) set(RF_BOARD "EXMIMO") set(PACKAGE_NAME "lte-softmodem") diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.txt b/cmake_targets/oaisim_build_oai/CMakeLists.txt index 4a4275129d5d209464145b7ad13f9c494c77f0a7..5e132f78f86ee83ad0c0c98df91de9385136e646 100644 --- a/cmake_targets/oaisim_build_oai/CMakeLists.txt +++ b/cmake_targets/oaisim_build_oai/CMakeLists.txt @@ -77,7 +77,7 @@ set ( USE_MME "R10" ) set ( USER_MODE True ) set ( XER_PRINT False ) set ( XFORMS False ) -set(XFORMS False ) -set(RRC_ASN1_VERSION "Rel8") +set(XFORMS 1 ) +set(RRC_ASN1_VERSION "Rel10") set(ENABLE_VCD_FIFO False ) include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)