[pinmux] Remove tie-off values TODO
This does not seem to be necessary anymore.
Signed-off-by: Michael Schaffner <msf@google.com>
diff --git a/hw/ip/pinmux/rtl/pinmux_pkg.sv b/hw/ip/pinmux/rtl/pinmux_pkg.sv
index eaed129..0466173 100644
--- a/hw/ip/pinmux/rtl/pinmux_pkg.sv
+++ b/hw/ip/pinmux/rtl/pinmux_pkg.sv
@@ -17,7 +17,6 @@
// the concatenated {DIO, MIO} packed array.
typedef struct packed {
logic const_sampling; // TODO: check whether this can be eliminated.
- logic [NumIOs-1:0] tie_offs; // TODO: check whether this can be eliminated.
integer tck_idx;
integer tms_idx;
integer trst_idx;
@@ -37,7 +36,6 @@
parameter target_cfg_t DefaultTargetCfg = '{
const_sampling: 1'b0,
- tie_offs: '0,
tck_idx: 0,
tms_idx: 0,
trst_idx: 0,
diff --git a/hw/ip/pinmux/rtl/pinmux_strap_sampling.sv b/hw/ip/pinmux/rtl/pinmux_strap_sampling.sv
index 949ecf5..742fd46 100644
--- a/hw/ip/pinmux/rtl/pinmux_strap_sampling.sv
+++ b/hw/ip/pinmux/rtl/pinmux_strap_sampling.sv
@@ -250,7 +250,7 @@
k == TargetCfg.trst_idx ||
k == TargetCfg.tdi_idx ||
k == TargetCfg.tdo_idx) begin : gen_jtag_signal
- assign in_core_o[k] = (jtag_en) ? TargetCfg.tie_offs[k] : in_padring_i[k];
+ assign in_core_o[k] = (jtag_en) ? 1'b0 : in_padring_i[k];
end else begin : gen_other_inputs
assign in_core_o[k] = in_padring_i[k];
end
diff --git a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv
index 9c69c34..4d53f10 100644
--- a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv
+++ b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv
@@ -101,16 +101,9 @@
parameter int TdiPadIdx = 37;
parameter int TdoPadIdx = 36;
- // TODO: this is temporary and will be removed in the future.
- // This specifies the tie-off values of the muxed MIO/DIOs
- // when the JTAG is active. SPI CSB is active low.
- localparam logic [pinmux_pkg::NumIOs-1:0] TieOffValues = pinmux_pkg::NumIOs'(1'b1 << (
- pinmux_reg_pkg::NMioPads + DioSpiDeviceCsb));
-
// DFT and Debug signal positions in the pinout.
localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
const_sampling: 1'b1,
- tie_offs: TieOffValues, // TODO: can we remove this and just set it to zero?
tck_idx: TckPadIdx,
tms_idx: TmsPadIdx,
trst_idx: TrstNPadIdx,
diff --git a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_nexysvideo.sv b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_nexysvideo.sv
index 9fbb548..ea2ce76 100644
--- a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_nexysvideo.sv
+++ b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_nexysvideo.sv
@@ -88,16 +88,9 @@
parameter int TdiPadIdx = 51;
parameter int TdoPadIdx = 52;
- // TODO: this is temporary and will be removed in the future.
- // This specifies the tie-off values of the muxed MIO/DIOs
- // when the JTAG is active. SPI CSB is active low.
- localparam logic [pinmux_pkg::NumIOs-1:0] TieOffValues = pinmux_pkg::NumIOs'(1'b1 << (
- pinmux_reg_pkg::NMioPads + DioSpiDeviceCsb));
-
// DFT and Debug signal positions in the pinout.
localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
const_sampling: 1'b1,
- tie_offs: TieOffValues, // TODO: can we remove this and just set it to zero?
tck_idx: TckPadIdx,
tms_idx: TmsPadIdx,
trst_idx: TrstNPadIdx,
diff --git a/hw/top_earlgrey/rtl/chip_earlgrey_verilator.sv b/hw/top_earlgrey/rtl/chip_earlgrey_verilator.sv
index d2102c3..7bff8f0 100644
--- a/hw/top_earlgrey/rtl/chip_earlgrey_verilator.sv
+++ b/hw/top_earlgrey/rtl/chip_earlgrey_verilator.sv
@@ -126,7 +126,6 @@
// DFT and Debug signal positions in the pinout.
localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
const_sampling: 1'b1,
- tie_offs: '0,
tck_idx: pinmux_reg_pkg::NMioPads +
top_earlgrey_pkg::DioSpiDeviceSck,
tms_idx: pinmux_reg_pkg::NMioPads +
diff --git a/hw/top_englishbreakfast/rtl/chip_englishbreakfast_verilator.sv b/hw/top_englishbreakfast/rtl/chip_englishbreakfast_verilator.sv
index 2dac22f..3eab8f5 100644
--- a/hw/top_englishbreakfast/rtl/chip_englishbreakfast_verilator.sv
+++ b/hw/top_englishbreakfast/rtl/chip_englishbreakfast_verilator.sv
@@ -126,7 +126,6 @@
// DFT and Debug signal positions in the pinout.
localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
const_sampling: 1'b1,
- tie_offs: '0,
tck_idx: pinmux_reg_pkg::NMioPads +
top_englishbreakfast_pkg::DioSpiDeviceSck,
tms_idx: pinmux_reg_pkg::NMioPads +
diff --git a/util/topgen/templates/chiplevel.sv.tpl b/util/topgen/templates/chiplevel.sv.tpl
index dd0c9ba..fb146d0 100644
--- a/util/topgen/templates/chiplevel.sv.tpl
+++ b/util/topgen/templates/chiplevel.sv.tpl
@@ -122,16 +122,9 @@
% endfor
% endif
- // TODO: this is temporary and will be removed in the future.
- // This specifies the tie-off values of the muxed MIO/DIOs
- // when the JTAG is active. SPI CSB is active low.
- localparam logic [pinmux_pkg::NumIOs-1:0] TieOffValues = pinmux_pkg::NumIOs'(1'b1 << (
- pinmux_reg_pkg::NMioPads + DioSpiDeviceCsb));
-
// DFT and Debug signal positions in the pinout.
localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
const_sampling: 1'b1,
- tie_offs: TieOffValues, // TODO: can we remove this and just set it to zero?
tck_idx: TckPadIdx,
tms_idx: TmsPadIdx,
trst_idx: TrstNPadIdx,
