machine configs: Add SGX to MACHINE_FEATURES

* Add sgx to MACHINE_FEATURES to indicate that a particular machine supports
  sgx.
* TI chips are available in multiple variants including some that supports sgx
  while others do not.
* By adding sgx as a machine feature other layers can create generic
  packagegroups or images for a particular soc but will only include sgx
  dependencies if the particular machine has sgx support.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf
index cd30594b69b9c8739460cfc0db88c26e1586d576..288935897a695088618d766a6a1d38442a68be82 100644 (file)
--- 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 536d337cc4a29f173349f7fd101c297ddc04c4e6..d9ce75865f47defd4add1bdd5bda1d2326a81058 100644 (file)
--- 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 866abc58e23e1b3ce5173de3aa66486a271f6947..2d1d44d8ebf1953b5a7b233725f8c82e5b8a8f4a 100644 (file)
--- 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 5d9cc8f176ffcebfe18bc30eb67f568f64b37091..b2df3703434d48a89942d776b56252a5163c9a34 100644 (file)
--- 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 2a84cad96cb14539c112eb00e0fa7aa66653a5ed..3b2145d66159cd8e6a7bfc9670f050fd56808c5f 100644 (file)
--- 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 8f84c6ccabff58d4b15194ffb01c39607beaa45e..e8b62792d3f73daf40e8da5ff3d64265d52277f8 100644 (file)
--- 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 3803edf6f39c9b04e2c2cfbb5994a5e5efea5576..43af461b96304830ff5b9fa683ac72f5bdf8146e 100644 (file)
--- 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 b85c4894cda10b3bfd5fcc60aa12c99f71c07bd0..a81d7fd702e31e56b7495ec73730be1794dd1f6a 100644 (file)
--- 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 a7ab9b0860ef7d5ac1b57d49f1ee9abc8eeba6d8..380c4b8b83425bf2b297f4d824754c2ea04b3b38 100644 (file)
--- 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 140dcc10ebf290a86c1823deb008116d32fb7fe7..4fa1e247421f224d74c4bc3c7fa23b3d1407947f 100644 (file)
--- 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 8439e0aaf2765586824b6edec2abc7f48b21751c..6c52d9eeb7476bc5c67c31c69db72400fbac0797 100644 (file)
--- 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 dfedf0fc7221efb68503227e1f98f05b98a59a6d..071967159a916f2ca422b99f74dd304dfafc657c 100644 (file)
--- 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 2c37b4fa6c56c9600175779e1d11bb341edf60e6..3ebd6d93276ec85cbaba74afed6b66803ce96658 100644 (file)
--- 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"