Merge branch 'develop-nb-iot-merge' of...

Merge branch 'develop-nb-iot-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nb-iot-merge

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band28.tm1.50PRB.usrpb210.conf

@@ -15,8 +15,10 @@ eNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";
 
-    mobile_country_code =  "208";
-    mobile_network_code =  "93";
+    plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
+
+    tr_s_preference     = "local_mac"
+
 
        ////////// Physical parameters: