maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the translation of ENB_S1 flag to the compilation directives

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6161 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2014-12-04 12:39:17 +00:00
parent 61eb82252e
commit 9ffd4f2929
5 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/Makedirectives
-20
View File
@@ -1,20 +0,0 @@
ifdef ENB_S1
ENABLE_ITTI=1
USE_MME=R10
DISABLE_XER_PRINT=1
LINK_PDCP_TO_GTPV1U=1
SECU=1
PHY_ABSTRACTION=0
endif
ifndef OPENAIR2
OPENAIR2=1
endif
ifdef DEBUG
DISABLE_XER_PRINT=0
MSG_PRINT=1
endif
targets/RT/USER/Makefile
+9 -1
View File
@@ -4,7 +4,6 @@ include $(OPENAIR_TARGETS)/Makerules
default: lte-softmodem
all: lte-softmodem rrh
include $(OPENAIR_TARGETS)/Makedirectives
include $(OPENAIR_TARGETS)/Makefile.common
GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g')
@@ -35,6 +34,15 @@ endif
CFLAGS += -O2
CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON -I.
ifndef OPENAIR2
OPENAIR2=1
endif
ifdef DEBUG
DISABLE_XER_PRINT=0
MSG_PRINT=1
endif
ifeq ($(EXMIMO),1)
CFLAGS += -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
endif
targets/SIMU/USER/Makefile
+9 -1
View File
@@ -3,7 +3,6 @@ include $(OPENAIR_TARGETS)/Makerules
default: oaisim
include $(OPENAIR_TARGETS)/Makedirectives
include $(OPENAIR_TARGETS)/Makefile.common
TOP_DIR = $(OPENAIR1_DIR)
@@ -49,6 +48,15 @@ CFLAGS += -DNEW_FFT
#CFLAGS += -DLLR8
CFLAGS += -DPACKAGE_NAME='"oaisim"'
ifndef OPENAIR2
OPENAIR2=1
endif
ifdef DEBUG
DISABLE_XER_PRINT=0
MSG_PRINT=1
endif
ifndef OPENAIR_EMU
export OPENAIR_EMU=1
endif
targets/TEST/OAI/case11.py
+1 -1
View File
@@ -52,7 +52,7 @@ def execute(oai, user, pw, host,logfile,logdir,debug):
try:
test = '01'
name = 'Compile oai.rel8.phy.dlsim.make'
conf = 'make dlsim'
conf = 'make dlsim' # PERFECT_CE=1 # for perfect channel estimation
trace = logdir + '/log_' + case + test + '.txt;'
tee = ' 2>&1 | tee ' + trace
diag = 'check the compilation errors for dlsim in $OPENAIR1_DIR/SIMULATION/LTE_PHY'
targets/build_oai.bash
+15 -4
View File
@@ -227,19 +227,30 @@ build_enb(){
echo_info "5. building the compilation directives ..."
SOFTMODEM_DIRECTIVES="ENB_S1=$ENB_S1 DEBUG=$DEBUG XFORMS=$XFORMS "
OAISIM_DIRECTIVES="ENB_S1=$ENB_S1 DEBUG=$DEBUG XFORMS=$XFORMS "
SOFTMODEM_DIRECTIVES="DEBUG=$DEBUG XFORMS=$XFORMS "
OAISIM_DIRECTIVES="DEBUG=$DEBUG XFORMS=$XFORMS "
if [ $ENB_S1 = 1 ]; then
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES USE_MME=R10 ENABLE_ITTI=1 LINK_PDCP_TO_GTPV1U=1 SECU=1 "
OAISIM_DIRECTIVES="$OAISIM_DIRECTIVES USE_MME=R10 ENABLE_ITTI=1 LINK_PDCP_TO_GTPV1U=1 SECU=1 "
fi
if [ $DEBUG = 0 ]; then
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES DISABLE_XER_PRINT=1 "
OAISIM_DIRECTIVES="$OAISIM_DIRECTIVES DISABLE_XER_PRINT=1 "
fi
if [ $HW = "USRP" ]; then
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES USRP=1 "
fi
if [ $HW = "EXMIMO" ]; then
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES EXMIMO=1"
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES EXMIMO=1 "
fi
if [ $HW = "ETHERNET" ]; then
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES ETHERNET=1"
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES ETHERNET=1 "
fi
if [ $ENB_S1 -eq 0 ]; then