diff --git a/config/derivlist.txt b/config/derivlist.txt
index 174ca5191..607049d96 100644
--- a/config/derivlist.txt
+++ b/config/derivlist.txt
@@ -314,9 +314,6 @@ BTB_SIZE          32'd14
 deriv bpred_GSHARE_10_16_16_1_rv32gc rv32gc
 BTB_SIZE          32'd16
 
-
-
-
 deriv bpred_GSHARE_6_16_10_0_rv32gc bpred_GSHARE_6_16_10_1_rv32gc 
 INSTR_CLASS_PRED  0
 
@@ -905,7 +902,6 @@ deriv f_div_4_4_rv64gc    div_4_4_rv64gc
 D_SUPPORTED     0
 ZFH_SUPPORTED   0
 
-
 #### FH_only, RK variable
 deriv fh_div_2_1_rv32gc    div_2_1_rv32gc    
 D_SUPPORTED     0
@@ -993,7 +989,6 @@ ZFH_SUPPORTED   0
 deriv fd_div_4_4_rv64gc    div_4_4_rv64gc    
 ZFH_SUPPORTED   0
 
-
 # FDH only , rk variable
 
 deriv fdh_div_2_1_rv32gc    div_2_1_rv32gc    
diff --git a/config/rv32e/config.vh b/config/rv32e/config.vh
index 4ec0123d1..e4d358782 100644
--- a/config/rv32e/config.vh
+++ b/config/rv32e/config.vh
@@ -33,6 +33,9 @@ localparam XLEN = 32'd32;
 // IEEE 754 compliance
 localparam IEEE754 = 0;
 
+// Debug Module implemented                                                                                                          
+localparam logic DEBUG_SUPPORTED = 1'b0;
+
 // RISC-V configuration per specification
 // Base instruction set (defaults to I if E is not supported)
 localparam logic E_SUPPORTED = 1;
diff --git a/config/rv32gc/config.vh b/config/rv32gc/config.vh
index c861759d9..2854b64fb 100644
--- a/config/rv32gc/config.vh
+++ b/config/rv32gc/config.vh
@@ -33,6 +33,9 @@ localparam XLEN = 32'd32;
 // IEEE 754 compliance
 localparam IEEE754 = 0;
 
+// Debug Module implemented                                                                                                          
+localparam logic DEBUG_SUPPORTED = 1'b0;
+
 // RISC-V configuration per specification
 // Base instruction set (defaults to I if E is not supported)
 localparam logic E_SUPPORTED = 0;
diff --git a/config/rv32i/config.vh b/config/rv32i/config.vh
index 01818afc2..7c378ca56 100644
--- a/config/rv32i/config.vh
+++ b/config/rv32i/config.vh
@@ -33,6 +33,9 @@ localparam XLEN = 32'd32;
 // IEEE 754 compliance
 localparam IEEE754 = 0;
 
+// Debug Module implemented                                                                                                          
+localparam logic DEBUG_SUPPORTED = 1'b0;
+
 // RISC-V configuration per specification
 // Base instruction set (defaults to I if E is not supported)
 localparam logic E_SUPPORTED = 0;
diff --git a/config/rv32imc/config.vh b/config/rv32imc/config.vh
index 05a8fd242..a42721b85 100644
--- a/config/rv32imc/config.vh
+++ b/config/rv32imc/config.vh
@@ -33,6 +33,9 @@ localparam XLEN = 32'd32;
 // IEEE 754 compliance
 localparam IEEE754 = 0;
 
+// Debug Module implemented                                                                                                          
+localparam logic DEBUG_SUPPORTED = 1'b0;
+
 // RISC-V configuration per specification
 // Base instruction set (defaults to I if E is not supported)
 localparam logic E_SUPPORTED = 0;
diff --git a/config/rv64gc/config.vh b/config/rv64gc/config.vh
index b8ed8dc47..b2e70abcb 100644
--- a/config/rv64gc/config.vh
+++ b/config/rv64gc/config.vh
@@ -33,6 +33,9 @@ localparam XLEN = 32'd64;
 // IEEE 754 compliance
 localparam IEEE754 = 0;
 
+// Debug Module implemented                                                                                                          
+localparam logic DEBUG_SUPPORTED = 1'b1;
+
 // RISC-V configuration per specification
 // Base instruction set (defaults to I if E is not supported)
 localparam logic E_SUPPORTED = 0;
diff --git a/config/rv64i/config.vh b/config/rv64i/config.vh
index 94360877f..82c58e07b 100644
--- a/config/rv64i/config.vh
+++ b/config/rv64i/config.vh
@@ -33,6 +33,9 @@ localparam XLEN = 32'd64;
 // IEEE 754 compliance
 localparam IEEE754 = 0;
 
+// Debug Module implemented                                                                                                          
+localparam logic DEBUG_SUPPORTED = 1'b0;
+
 // RISC-V configuration per specification
 // Base instruction set (defaults to I if E is not supported)
 localparam logic E_SUPPORTED = 0;
diff --git a/config/shared/config-shared.vh b/config/shared/config-shared.vh
index 37fe0febc..5e3a2e419 100644
--- a/config/shared/config-shared.vh
+++ b/config/shared/config-shared.vh
@@ -16,9 +16,6 @@ localparam SVMODE_BITS = (XLEN==32 ? 32'd1 : 32'd4);
 localparam ASID_BASE = (XLEN==32 ? 32'd22 : 32'd44);
 localparam ASID_BITS = (XLEN==32 ? 32'd9 : 32'd16);
 
-// Debug Module implemented                                                                                                          
-localparam logic DEBUG_SUPPORTED = 1'b0;
-
 // constants to check SATP_MODE against
 // defined in Table 4.3 of the privileged spec
 localparam NO_TRANSLATE = 4'd0;