diff --git a/config/rv32gc/config.vh b/config/rv32gc/config.vh
index 69d3329f5..3b306a005 100644
--- a/config/rv32gc/config.vh
+++ b/config/rv32gc/config.vh
@@ -45,7 +45,7 @@ localparam ZFH_SUPPORTED = 0;
 localparam SSTC_SUPPORTED = 1;
 localparam ZICBOM_SUPPORTED = 1;
 localparam ZICBOZ_SUPPORTED = 1;
-localparam ZICBOP_SUPPORTED = 0;
+localparam ZICBOP_SUPPORTED = 1;
 localparam ZICCLSM_SUPPORTED = 0;
 localparam SVPBMT_SUPPORTED = 0;
 localparam SVNAPOT_SUPPORTED = 0;
diff --git a/sim/lint-wally b/sim/lint-wally
index 263fb864f..eb6ad62b0 100755
--- a/sim/lint-wally
+++ b/sim/lint-wally
@@ -5,7 +5,7 @@ export PATH=$PATH:/usr/local/bin/
 verilator=`which verilator`
 
 basepath=$(dirname $0)/..
-for config in fpga rv32e rv64gc rv32gc rv32imc rv32i rv64i rv64fpquad; do
+for config in rv32e rv64gc rv32gc rv32imc rv32i rv64i rv64fpquad; do
 #for config in  rv64gc; do
     echo "$config linting..."
     if !($verilator --no-timing --lint-only "$@" --top-module wallywrapper "-I$basepath/config/shared" "-I$basepath/config/$config" $basepath/src/cvw.sv $basepath/testbench/wallywrapper.sv $basepath/src/*/*.sv $basepath/src/*/*/*.sv --relative-includes ); then