diff --git a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
index d17e4fb..cb89da9 100644
--- a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
+++ b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
@@ -167,6 +167,7 @@ object VexRiscvSmpClusterGen {
                      dBusWidth : Int = 64,
                      loadStoreWidth : Int = 32,
                      coherency : Boolean = true,
+                     atomic : Boolean = true,
                      iCacheSize : Int = 8192,
                      dCacheSize : Int = 8192,
                      iCacheWays : Int = 2,
@@ -270,9 +271,9 @@ object VexRiscvSmpClusterGen {
             catchAccessError  = true,
             catchIllegal      = true,
             catchUnaligned    = true,
-            withLrSc = true,
-            withAmo = true,
-            withExclusive = coherency,
+            withLrSc = atomic,
+            withAmo = atomic,
+            withExclusive = atomic,
             withInvalidate = coherency,
             withWriteAggregation = dBusWidth > 32
           ),