Skip to content

O
OpenXG-RAN
Commit 2157727f authored by bruno mongazon's avatar bruno mongazon
Browse files
Options

Fix #582, PC_TARGET removed

parent dac7888f
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 15 deletions
cmake_targets/CMakeLists.txt
View file @ 2157727f
...@@ -631,7 +631,6 @@ add_integer_option(MAX_NUM_CCs 1 "????") ...@@ -631,7 +631,6 @@ add_integer_option(MAX_NUM_CCs 1 "????")
add_boolean_option(MU_RECEIVER False "????") add_boolean_option(MU_RECEIVER False "????")
add_boolean_option(NEW_FFT True "????") add_boolean_option(NEW_FFT True "????")
add_boolean_option(OPENAIR1 True "????") add_boolean_option(OPENAIR1 True "????")
add_boolean_option(PC_TARGET True "????")
add_boolean_option(PERFECT_CE False "????") add_boolean_option(PERFECT_CE False "????")
add_boolean_option(PHYSIM True "for L1 simulators (dlsim, ulsim, ...)") add_boolean_option(PHYSIM True "for L1 simulators (dlsim, ulsim, ...)")
add_boolean_option(PHY_CONTEXT True "not clear: must remain False for dlsim") add_boolean_option(PHY_CONTEXT True "not clear: must remain False for dlsim")
......
cmake_targets/epc_test/CMakeLists.template
View file @ 2157727f
...@@ -49,7 +49,6 @@ set ( OPENAIR2 True ) ...@@ -49,7 +49,6 @@ set ( OPENAIR2 True )
set ( OPENAIR_LTE True ) set ( OPENAIR_LTE True )
set ( PACKAGE_NAME "epc_test" ) set ( PACKAGE_NAME "epc_test" )
set ( PDCP_USE_NETLINK True ) set ( PDCP_USE_NETLINK True )
set ( PC_TARGET True )
set ( PDCP_MSG_PRINT False ) set ( PDCP_MSG_PRINT False )
set ( PERFECT_CE False ) set ( PERFECT_CE False )
set ( PHY_CONTEXT False ) set ( PHY_CONTEXT False )
......
cmake_targets/oaisim_build_oai/CMakeLists.template
View file @ 2157727f
...@@ -48,7 +48,6 @@ set ( OPENAIR2 True ) ...@@ -48,7 +48,6 @@ set ( OPENAIR2 True )
set ( OPENAIR_LTE True ) set ( OPENAIR_LTE True )
set ( PACKAGE_NAME "oaisim" ) set ( PACKAGE_NAME "oaisim" )
set ( PDCP_USE_NETLINK True ) set ( PDCP_USE_NETLINK True )
set ( PC_TARGET True )
set ( PDCP_MSG_PRINT False ) set ( PDCP_MSG_PRINT False )
set ( PERFECT_CE False ) set ( PERFECT_CE False )
set ( PHY_CONTEXT False ) set ( PHY_CONTEXT False )
......
cmake_targets/oaisim_mme_build_oai/CMakeLists.template
View file @ 2157727f
...@@ -49,7 +49,6 @@ set ( OPENAIR2 False ) ...@@ -49,7 +49,6 @@ set ( OPENAIR2 False )
set ( OPENAIR_EMU False ) set ( OPENAIR_EMU False )
set ( OPENAIR_LTE False ) set ( OPENAIR_LTE False )
set ( PACKAGE_NAME "EPC" ) set ( PACKAGE_NAME "EPC" )
set ( PC_TARGET False )
set ( PDCP_MSG_PRINT False ) set ( PDCP_MSG_PRINT False )
set ( PERFECT_CE False ) set ( PERFECT_CE False )
set ( PHY_CONTEXT False ) set ( PHY_CONTEXT False )
......
cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
View file @ 2157727f
...@@ -50,7 +50,6 @@ set ( OPENAIR_EMU False ) ...@@ -50,7 +50,6 @@ set ( OPENAIR_EMU False )
set ( OPENAIR_LTE True ) set ( OPENAIR_LTE True )
set ( PACKAGE_NAME "oaisim" ) set ( PACKAGE_NAME "oaisim" )
set ( PDCP_USE_NETLINK True ) set ( PDCP_USE_NETLINK True )
set ( PC_TARGET True )
set ( PDCP_MSG_PRINT False ) set ( PDCP_MSG_PRINT False )
set ( PERFECT_CE False ) set ( PERFECT_CE False )
set ( PHY_CONTEXT False ) set ( PHY_CONTEXT False )
......
cmake_targets/s1c_mme_test/CMakeLists.template
View file @ 2157727f
...@@ -49,7 +49,6 @@ set ( OPENAIR2 True ) ...@@ -49,7 +49,6 @@ set ( OPENAIR2 True )
set ( OPENAIR_LTE True ) set ( OPENAIR_LTE True )
set ( PACKAGE_NAME "oaisim" ) set ( PACKAGE_NAME "oaisim" )
set ( PDCP_USE_NETLINK True ) set ( PDCP_USE_NETLINK True )
set ( PC_TARGET True )
set ( PDCP_MSG_PRINT False ) set ( PDCP_MSG_PRINT False )
set ( PERFECT_CE False ) set ( PERFECT_CE False )
set ( PHY_CONTEXT False ) set ( PHY_CONTEXT False )
......
common/utils/telnetsrv/CMakeLists.txt
View file @ 2157727f
...@@ -24,7 +24,7 @@ set(OPENAIR_NFAPIINC $ENV{NFAPI_DIR} ) ...@@ -24,7 +24,7 @@ set(OPENAIR_NFAPIINC $ENV{NFAPI_DIR} )
set(CMAKE_INSTALL_PREFIX $ENV{OPENAIR_TARGETS}) set(CMAKE_INSTALL_PREFIX $ENV{OPENAIR_TARGETS})
add_definitions (-DRel14 -DCMAKER -DENABLE_ITTI -DENABLE_NAS_UE_LOGGING -DENABLE_SECURITY -DENABLE_USE_CPU_EXECUTION_TIME -DENABLE_USE_MME -DENABLE_VCD -DENB_AGENT -DENB_MODE -DETHERNET=1 -DEXMIMO_IOT -DJUMBO_FRAME -DLINK_ENB_PDCP_TO_GTPV1U -DLOG_NO_THREAD -DMAC_CONTEXT -DMAX_NUM_CCs=1 -DNAS_BUILT_IN_UE -DNAS_UE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DNEW_FFT -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK -DOPENAIR1 -DOPENAIR2 -DOPENAIR_LTE -DPC_TARGET -DPHYSIM -DPHY_CONTEXT -DPUCCH -DRel10=1 -DS1AP_VERSION=R10 -DTRACE_RLC_MUTEX -DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3) add_definitions (-DRel14 -DCMAKER -DENABLE_ITTI -DENABLE_NAS_UE_LOGGING -DENABLE_SECURITY -DENABLE_USE_CPU_EXECUTION_TIME -DENABLE_USE_MME -DENABLE_VCD -DENB_AGENT -DENB_MODE -DETHERNET=1 -DEXMIMO_IOT -DJUMBO_FRAME -DLINK_ENB_PDCP_TO_GTPV1U -DLOG_NO_THREAD -DMAC_CONTEXT -DMAX_NUM_CCs=1 -DNAS_BUILT_IN_UE -DNAS_UE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DNEW_FFT -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK -DOPENAIR1 -DOPENAIR2 -DOPENAIR_LTE -DPHYSIM -DPHY_CONTEXT -DPUCCH -DRel10=1 -DS1AP_VERSION=R10 -DTRACE_RLC_MUTEX -DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3)
add_compile_options( -fPIC -march=native -Ofast) add_compile_options( -fPIC -march=native -Ofast)
include_directories( ./ ${OPENAIR_COMMON_DIR} ${OPENAIR_DIR} ${OPENAIR1_DIR} ${OPENAIR2_DIR} ${OPENAIR2_COMMON_DIR} ${OPENAIR2_DIR}/UTIL/LOG include_directories( ./ ${OPENAIR_COMMON_DIR} ${OPENAIR_DIR} ${OPENAIR1_DIR} ${OPENAIR2_DIR} ${OPENAIR2_COMMON_DIR} ${OPENAIR2_DIR}/UTIL/LOG
......
openair1/PHY/CODING/TESTBENCH/Makefile
View file @ 2157727f
...@@ -7,7 +7,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) ...@@ -7,7 +7,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
OPENAIR3 = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DNODE_RG -DPC_TARGET -DNO_UL_REF -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DOPENAIR_LTE -DMAX_NUM_CCs=1 CFLAGS += -DNODE_RG -DNO_UL_REF -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DOPENAIR_LTE -DMAX_NUM_CCs=1
ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
......
openair2/UTIL/OCG/makefile
View file @ 2157727f
...@@ -7,7 +7,7 @@ OPENAIR2_TOP = ../../../openair2 ...@@ -7,7 +7,7 @@ OPENAIR2_TOP = ../../../openair2
OPENAIR3_TOP = ../../../openair3 OPENAIR3_TOP = ../../../openair3
OPENAIR3 = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
CFLAGS += -m32 -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -m32 -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
......
openair2/UTIL/OMG/makefile
View file @ 2157727f
...@@ -60,7 +60,7 @@ OPENAIR2_TOP = ../../../openair2 ...@@ -60,7 +60,7 @@ OPENAIR2_TOP = ../../../openair2
OPENAIR3_TOP = ../../../openair3 OPENAIR3_TOP = ../../../openair3
OPENAIR3 = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
......
openair2/UTIL/OMG/makefile_old
View file @ 2157727f
...@@ -62,7 +62,7 @@ OPENAIR2_TOP = ../../../openair2 ...@@ -62,7 +62,7 @@ OPENAIR2_TOP = ../../../openair2
OPENAIR3_TOP = ../../../openair3 OPENAIR3_TOP = ../../../openair3
OPENAIR3 = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
......
targets/TEST/AT_COMMANDS/Makefile
View file @ 2157727f
...@@ -6,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) ...@@ -6,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR)
OPENAIR3 = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 CFLAGS += -m32 -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11
ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
......
targets/TEST/PACKET_TRACER/Makefile
View file @ 2157727f
...@@ -6,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) ...@@ -6,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR)
OPENAIR3 = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -m32 -DPHYSIM -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11 CFLAGS += -m32 -DPHYSIM -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11
ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
......
targets/TEST/PDCP/Makefile
View file @ 2157727f
...@@ -8,7 +8,7 @@ OPENAIR3 = $(OPENAIR3_DIR) ...@@ -8,7 +8,7 @@ OPENAIR3 = $(OPENAIR3_DIR)
EXE_FILE_NAME = test_pdcp EXE_FILE_NAME = test_pdcp
CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 CFLAGS += -m32 -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11
ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
......
targets/TEST/PDCP/with_rlc/Makefile.data_bearer
View file @ 2157727f
...@@ -8,7 +8,7 @@ OPENAIR3 = $(OPENAIR3_DIR) ...@@ -8,7 +8,7 @@ OPENAIR3 = $(OPENAIR3_DIR)
EXE_FILE_NAME = test_pdcp_rlc EXE_FILE_NAME = test_pdcp_rlc
CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 CFLAGS += -m32 -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11
ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment