diff --git a/targets/Makefile.common b/targets/Makefile.common index 8e49f6f977669753ca1226ec98441344f43afb2e..7ed3ab5e69a12d5486c880329301cc6ff083090e 100644 --- a/targets/Makefile.common +++ b/targets/Makefile.common @@ -57,7 +57,14 @@ endif endif CFLAGS += -DJUMBO_FRAME -COMMON_CFLAGS += -DMAX_NUM_CCs=1 + +ifdef MAX_NUM_CCs +CFLAGS += -DMAX_NUM_CCs=$(MAX_NUM_CCs) +COMMON_CFLAGS += -DMAX_NUM_CCs=$(MAX_NUM_CCs) +else +CFLAGS += -DMAX_NUM_CCs=1 +COMMON_CFLAGS += -DMAX_NUM_CCs=1 +endif ifeq ($(ENABLE_RAL), 1) CFLAGS += -DENABLE_RAL diff --git a/targets/RT/USER/Makefile b/targets/RT/USER/Makefile index d2963de1b54c8f3f2029b7536cb235501d1afdf9..98df836da70aafca233aaf18bced3b8b82fc71e4 100644 --- a/targets/RT/USER/Makefile +++ b/targets/RT/USER/Makefile @@ -25,8 +25,6 @@ endif CFLAGS += -O2 CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON -I. -CFLAGS += -DMAX_NUM_CCs=1 - 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 0d9836887b809f81d554e961bf5c6c86b43ede72..92812c8354322a62242a6fbd624fb2e3c9297657 100644 --- a/targets/SIMU/USER/Makefile +++ b/targets/SIMU/USER/Makefile @@ -123,7 +123,7 @@ $(info "Rel8=1") CFLAGS += -DRel8 endif -CFLAGS += -DMAX_NUM_CCs=1 +#CFLAGS += -DMAX_NUM_CCs=1 ifeq ($(RLC_STOP_ON_LOST_PDU), 1) CFLAGS += -DRLC_STOP_ON_LOST_PDU @@ -444,6 +444,7 @@ print: @echo "OCG_FLAG are " $(OCG_FLAG) @echo "CFLAGS are " $(CFLAGS) @echo "EXTRA_CFLAGS are" $(EXTRA_CFLAGS) + @echo "COMMON_CFLAGS are" $(COMMON_CFLAGS) @echo "L2 includes are" $(L2_incl) @echo "INCLUDES are" $(INCLUDES) @echo "S1AP Includes are" $(S1AP_Incl)