Merge remote-tracking branch 'origin/develop-SRS-MIMO' into develop-SRS-feedback

# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -63,14 +63,8 @@
 #define NR_BCCH_BCH 5    // MIB
 #define CCCH_PAYLOAD_SIZE_MAX 512 
 #define RAR_PAYLOAD_SIZE_MAX  128
-#define MAX_BWP_SIZE          275
 #define MAX_CSI_REPORTCONFIG  48
 
-typedef enum frequency_range_e {
-  FR1 = 0,
-  FR2
-} frequency_range_t;
-
 #define NR_BSR_TRIGGER_NONE      (0) /* No BSR Trigger */
 #define NR_BSR_TRIGGER_REGULAR   (1) /* For Regular and ReTxBSR Expiry Triggers */
 #define NR_BSR_TRIGGER_PERIODIC  (2) /* For BSR Periodic Timer Expiry Trigger */