From a8a1849a66aec5f65e7f9454499199be85bfde54 Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@nexedi.com>
Date: Wed, 22 Nov 2023 17:33:53 +0300
Subject: [PATCH] .
---
software/ors-amarisoft/config/enb.jinja2.cfg | 15 ++-------------
software/ors-amarisoft/config/out/enb.cfg | 6 ------
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/software/ors-amarisoft/config/enb.jinja2.cfg b/software/ors-amarisoft/config/enb.jinja2.cfg
index a4898dfed..10f0ea22d 100644
--- a/software/ors-amarisoft/config/enb.jinja2.cfg
+++ b/software/ors-amarisoft/config/enb.jinja2.cfg
@@ -452,19 +452,8 @@
{%- endfor %}
],
-{%- if do_lte %}
- // Carrier Aggregation: NR + LTE
- nr_dc_scg_cell_list: [
-{%- for cell2_ref, icell2 in icell_dict|dictsort %}
-{%- set cell2 = icell2['_'] %}
-{%- if cell2_ref != cell_ref and cell2.cell_type == 'lte' %}
- {
- cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
- },
-{%- endif %}
-{%- endfor %}
- ],
-{%- endif %}
+ {#- NOTE: NR + LTE Carrier Aggregation is setup via EN-DC only via en_dc_scg_cell_list.
+ nr_dc_scg_cell_list sets up NR+NR Dual Connectivity #}
// tune NR parameters for the cell XXX -> sdr/ors ? (see lte ^^^)
{%- if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
diff --git a/software/ors-amarisoft/config/out/enb.cfg b/software/ors-amarisoft/config/out/enb.cfg
index c484bd720..99a4cb45a 100644
--- a/software/ors-amarisoft/config/out/enb.cfg
+++ b/software/ors-amarisoft/config/out/enb.cfg
@@ -302,12 +302,6 @@
// Carrier Aggregation: NR + NR
scell_list: [
],
- // Carrier Aggregation: NR + LTE
- nr_dc_scg_cell_list: [
- {
- cell_id: 0x01, // + CELL_a
- },
- ],
// tune NR parameters for the cell XXX -> sdr/ors ? (see lte ^^^)
manual_ref_signal_power: true,
--
2.30.9