13 files changed, 18 insertions, 8 deletions

diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf
index cd30594b..28893589 100644
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/am335x-evm.conf
@@ -43,4 +43,4 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am335x_evm_config"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx"
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index 536d337c..d9ce7586 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -30,7 +30,7 @@ UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet sgx"
 
 # NOTE: there are NAND and OneNAND versions of this board...
 
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
index 866abc58..2d1d44d8 100644
--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -29,7 +29,7 @@ UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
 XLOAD_MACHINE = "omap3evm_config"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx"
 
 # NOTE: there are NAND and OneNAND versions of this board...
 
diff --git a/conf/machine/am387x-evm.conf b/conf/machine/am387x-evm.conf
index 5d9cc8f1..b2df3703 100644
--- a/conf/machine/am387x-evm.conf
+++ b/conf/machine/am387x-evm.conf
@@ -5,3 +5,5 @@
 require conf/machine/include/ti814x.inc
 
 IMAGE_FSTYPES += "ubi tar.gz"
+
+MACHINE_FEATURES += "sgx"
diff --git a/conf/machine/am389x-evm.conf b/conf/machine/am389x-evm.conf
index 2a84cad9..3b2145d6 100644
--- a/conf/machine/am389x-evm.conf
+++ b/conf/machine/am389x-evm.conf
@@ -5,3 +5,5 @@
 require conf/machine/include/ti816x.inc
 
 IMAGE_FSTYPES += "ubi tar.gz"
+
+MACHINE_FEATURES += "sgx"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 8f84c6cc..e8b62792 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -45,7 +45,7 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 # and sdio
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa sgx"
 
 # For a modularized kernel we want to drag in networking, sound, rtc etc."
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-smsc95xx kernel-module-snd-soc-twl4030 kernel-module-rtc-twl \
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 3803edf6..43af461b 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -23,4 +23,4 @@ SERIAL_CONSOLE = "115200 ttyO0"
 UBOOT_MACHINE = "am335x_evm_config"
 
 # and sdio
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa sgx"
diff --git a/conf/machine/c6a814x-evm.conf b/conf/machine/c6a814x-evm.conf
index b85c4894..a81d7fd7 100644
--- a/conf/machine/c6a814x-evm.conf
+++ b/conf/machine/c6a814x-evm.conf
@@ -3,3 +3,5 @@
 #@DESCRIPTION: Machine configuration for the c6a814x evm
 
 require conf/machine/include/ti814x.inc
+
+MACHINE_FEATURES += "sgx"
diff --git a/conf/machine/c6a816x-evm.conf b/conf/machine/c6a816x-evm.conf
index a7ab9b08..380c4b8b 100644
--- a/conf/machine/c6a816x-evm.conf
+++ b/conf/machine/c6a816x-evm.conf
@@ -3,3 +3,5 @@
 #@DESCRIPTION: Machine configuration for the c6a816x evm
 
 require conf/machine/include/ti816x.inc
+
+MACHINE_FEATURES += "sgx"
diff --git a/conf/machine/dm814x-evm.conf b/conf/machine/dm814x-evm.conf
index 140dcc10..4fa1e247 100644
--- a/conf/machine/dm814x-evm.conf
+++ b/conf/machine/dm814x-evm.conf
@@ -3,3 +3,5 @@
 #@DESCRIPTION: Machine configuration for the DM814x evm
 
 require conf/machine/include/ti814x.inc
+
+MACHINE_FEATURES += "sgx"
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 8439e0aa..6c52d9ee 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -43,4 +43,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 # and sdio
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen sgx"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index dfedf0fc..07196715 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -30,7 +30,7 @@ UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
 XLOAD_MACHINE = "omap3evm_config"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx"
 
 # NOTE: there are NAND and OneNAND versions of this board...
 
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf
index 2c37b4fa..3ebd6d93 100644
--- a/conf/machine/pandaboard.conf
+++ b/conf/machine/pandaboard.conf
@@ -13,6 +13,6 @@ IMAGE_FSTYPES += "tar.bz2"
 SERIAL_CONSOLE = "115200 ttyO2"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat sgx"