diff --git a/server/cros/faft/config/DEFAULTS.py b/server/cros/faft/config/DEFAULTS.py
index 416f608..43602ab 100644
--- a/server/cros/faft/config/DEFAULTS.py
+++ b/server/cros/faft/config/DEFAULTS.py
@@ -118,6 +118,7 @@
     # Timeout of confirming DUT doesn't boot on USB image in Recovery screen
     usb_image_boot_timeout = 180
 
+    # Check SMMSTORE exists in FMap for x86 boards
     smm_store = True
 
     # True if the lid can wake the system from a powered off state
diff --git a/server/cros/faft/config/cheza.py b/server/cros/faft/config/cheza.py
index 5119ac5..f51ced1 100644
--- a/server/cros/faft/config/cheza.py
+++ b/server/cros/faft/config/cheza.py
@@ -14,4 +14,3 @@
     has_keyboard = False
     chrome_ec = True
     ec_capability = ['arm', 'battery', 'charging', 'lid']
-    smm_store = False
diff --git a/server/cros/faft/config/gru.py b/server/cros/faft/config/gru.py
index 987a93a..86bc3d8 100644
--- a/server/cros/faft/config/gru.py
+++ b/server/cros/faft/config/gru.py
@@ -12,4 +12,3 @@
     ec_capability = ['battery', 'charging', 'keyboard', 'arm', 'lid']
     ec_boot_to_console = 0.2
     firmware_screen = 7
-    smm_store = False
diff --git a/server/cros/faft/config/nyan.py b/server/cros/faft/config/nyan.py
index 1fb5292..a926cc1 100644
--- a/server/cros/faft/config/nyan.py
+++ b/server/cros/faft/config/nyan.py
@@ -15,4 +15,3 @@
     firmware_screen = 4
     wp_voltage = 'off'
     has_eventlog = False        # Shipped without RTC support in firmware
-    smm_store = False
diff --git a/server/cros/faft/config/oak.py b/server/cros/faft/config/oak.py
index 5a0a8ca..d1d0b97 100644
--- a/server/cros/faft/config/oak.py
+++ b/server/cros/faft/config/oak.py
@@ -10,4 +10,3 @@
     chrome_ec = True
     ec_capability = ['battery', 'charging', 'keyboard', 'arm', 'lid']
     ec_has_powerbtn_cmd = False
-    smm_store = False
diff --git a/server/cros/faft/config/pi.py b/server/cros/faft/config/pi.py
index 39c6af9..13b93c0 100644
--- a/server/cros/faft/config/pi.py
+++ b/server/cros/faft/config/pi.py
@@ -11,4 +11,3 @@
     ec_capability = (['battery', 'keyboard', 'arm', 'lid'])
     ec_has_powerbtn_cmd = False
     has_eventlog = False        # No RTC support in firmware
-    smm_store = False
diff --git a/server/cros/faft/config/pit.py b/server/cros/faft/config/pit.py
index d7b311c..977755a 100644
--- a/server/cros/faft/config/pit.py
+++ b/server/cros/faft/config/pit.py
@@ -11,4 +11,3 @@
     ec_capability = (['battery', 'keyboard', 'arm', 'lid'])
     ec_has_powerbtn_cmd = False
     has_eventlog = False        # No RTC support in firmware
-    smm_store = False
diff --git a/server/cros/faft/config/skate.py b/server/cros/faft/config/skate.py
index 5237f64..d2dbdde 100644
--- a/server/cros/faft/config/skate.py
+++ b/server/cros/faft/config/skate.py
@@ -13,4 +13,3 @@
     ec_capability = (['battery', 'keyboard', 'arm', 'lid'])
     ec_has_powerbtn_cmd = False
     has_eventlog = False        # No RTC support in firmware
-    smm_store = False
diff --git a/server/cros/faft/config/snow.py b/server/cros/faft/config/snow.py
index b31f927..9751f33 100644
--- a/server/cros/faft/config/snow.py
+++ b/server/cros/faft/config/snow.py
@@ -13,4 +13,3 @@
     ec_has_powerbtn_cmd = False
     use_u_boot = True
     has_eventlog = False
-    smm_store = False
diff --git a/server/cros/faft/config/spring.py b/server/cros/faft/config/spring.py
index 898b581..279c07a 100644
--- a/server/cros/faft/config/spring.py
+++ b/server/cros/faft/config/spring.py
@@ -13,4 +13,3 @@
     ec_capability = (['battery', 'keyboard', 'arm', 'lid'])
     ec_has_powerbtn_cmd = False
     has_eventlog = False        # No RTC support in firmware
-    smm_store = False
diff --git a/server/cros/faft/config/veyron.py b/server/cros/faft/config/veyron.py
index d6f4e44..26fb873 100644
--- a/server/cros/faft/config/veyron.py
+++ b/server/cros/faft/config/veyron.py
@@ -11,4 +11,3 @@
     wp_voltage = 'pp3300'
     confirm_screen = 6
     has_eventlog = False        # for chrome-os-partner:61078
-    smm_store = False
diff --git a/server/site_tests/firmware_FMap/firmware_FMap.py b/server/site_tests/firmware_FMap/firmware_FMap.py
index bb529b8..e140fcd 100644
--- a/server/site_tests/firmware_FMap/firmware_FMap.py
+++ b/server/site_tests/firmware_FMap/firmware_FMap.py
@@ -159,7 +159,7 @@
                 succeed = False
                 logging.error('RW_LEGACY size is < 1M')
         # Check SMMSTORE section.
-        if self.faft_config.smm_store:
+        if self.faft_config.smm_store and 'x86' in self.run_cmd('uname -m')[0]:
             if 'SMMSTORE' not in bios:
                 succeed = False
                 logging.error('Missing SMMSTORE section in FMAP')