diff --git a/conf/machine/am335x-nmhw24.conf b/conf/machine/am335x-nmhw24.conf
index 5bf95df..8a21b0a 100644
--- a/conf/machine/am335x-nmhw24.conf
+++ b/conf/machine/am335x-nmhw24.conf
@@ -18,5 +18,6 @@ MACHINE_FEATURES += " \
 	toby-l2 \
 	bluetooth \
 	tibluetooth \
+	atsha \
 "
 
diff --git a/conf/machine/am335x-nrhw16.conf b/conf/machine/am335x-nrhw16.conf
index 4713d69..f4abb3d 100644
--- a/conf/machine/am335x-nrhw16.conf
+++ b/conf/machine/am335x-nrhw16.conf
@@ -17,4 +17,8 @@ KERNEL_IMAGETYPE = "fitImage"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
 
-MACHINE_FEATURES += "bluetooth tibluetooth"
+MACHINE_FEATURES += " \
+    bluetooth \
+    tibluetooth \
+    atsha \
+	"
diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf
index db87772..680d020 100644
--- a/conf/machine/am335x-nrhw20.conf
+++ b/conf/machine/am335x-nrhw20.conf
@@ -13,4 +13,9 @@ KERNEL_IMAGETYPE = "fitImage"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1"
 
-MACHINE_FEATURES += "toby-l2 bluetooth tibluetooth"
+MACHINE_FEATURES += " \
+    toby-l2 \
+    bluetooth \
+    tibluetooth \
+    atsha \
+	"
diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf
index 48e0088..2b74a9a 100644
--- a/conf/machine/armada-385-nrhw18.conf
+++ b/conf/machine/armada-385-nrhw18.conf
@@ -17,4 +17,7 @@ module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2"
 IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
 
-MACHINE_FEATURES += "fpga"
+MACHINE_FEATURES += " \
+    fpga \
+    atsha \
+	"