diff --git a/targets/Makedirectives b/targets/Makedirectives deleted file mode 100644 index 47aa113d2bb7ba357fd906e4db7f10ce86e90c94..0000000000000000000000000000000000000000 --- a/targets/Makedirectives +++ /dev/null @@ -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 - - - diff --git a/targets/RT/USER/Makefile b/targets/RT/USER/Makefile index 595ab608c27633c6689ff2dc55e08cd764b0a70a..676e37cb02f1f85291ad3acf51be19525acc8eed 100644 --- a/targets/RT/USER/Makefile +++ b/targets/RT/USER/Makefile @@ -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 diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile index 92812c8354322a62242a6fbd624fb2e3c9297657..967e6d7c10d3373a3d2868ca8faf1cbacab1e194 100644 --- a/targets/SIMU/USER/Makefile +++ b/targets/SIMU/USER/Makefile @@ -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 diff --git a/targets/TEST/OAI/case11.py b/targets/TEST/OAI/case11.py index c7b5fcbb8c2eb39d43400dacb799ca6dcaa1d8ee..69319ff4af0e87c0a24c7059a0c48bf78c85b9a9 100644 --- a/targets/TEST/OAI/case11.py +++ b/targets/TEST/OAI/case11.py @@ -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' diff --git a/targets/build_oai.bash b/targets/build_oai.bash index 41ce13726264a66de52d81cda66a899c58f147d4..a0db324e686e0aeb4d106d65815c0916de02e909 100755 --- a/targets/build_oai.bash +++ b/targets/build_oai.bash @@ -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