summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/phyam335x.inc4
-rw-r--r--conf/machine/phyboard-maia-am335x-1.conf3
-rw-r--r--conf/machine/phyboard-wega-am335x-1.conf2
-rw-r--r--conf/machine/phyboard-wega-am335x-2.conf3
-rw-r--r--conf/machine/phyboard-wega-am335x-3.conf3
-rw-r--r--conf/machine/phyboard-wega-am335x-4.conf3
-rw-r--r--conf/machine/phycore-am335x-1.conf2
-rw-r--r--conf/machine/phycore-am335x-2.conf2
-rw-r--r--conf/machine/phycore-am335x-3.conf2
-rw-r--r--conf/machine/phycore-am335x-4.conf2
-rw-r--r--conf/machine/phycore-am335x-5.conf2
-rw-r--r--conf/machine/phycore-am335x-6.conf2
-rw-r--r--conf/machine/phycore-am335x-7.conf3
-rw-r--r--conf/machine/phyflex-am335x-1.conf2
-rw-r--r--conf/machine/phyflex-am335x-2.conf2
-rw-r--r--conf/machine/phyflex-am335x-3.conf2
-rw-r--r--conf/machine/phyflex-am335x-4.conf2
17 files changed, 17 insertions, 24 deletions
diff --git a/conf/machine/include/phyam335x.inc b/conf/machine/include/phyam335x.inc
index d12cbe1..eecd97d 100644
--- a/conf/machine/include/phyam335x.inc
+++ b/conf/machine/include/phyam335x.inc
@@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc
DEFAULTTUNE ?= "cortexa8thf-neon"
require conf/machine/include/tune-cortexa8.inc
# List common SoC features
-MACHINE_FEATURES = "kernel26 usbgadget usbhost vfat ext2 screen alsa ethernet sgx can"
+MACHINE_FEATURES = "kernel26 usbgadget usbhost vfat ext2 screen alsa ethernet can"
# Sub-architecture support adapted fom fsl-arm
MACHINE_SOCARCH = "${TUNE_PKGARCH}-ti33x"
@@ -39,8 +39,6 @@ MODULE_TARBALL_DEPLOY = "0"
# the newer version makes a lot of problems dont include
# per default
RDEPENDS_kernel-modules_append = " amx3-cm3"
-# SGX GPL Kernel Modules
-IMAGE_INSTALL_append = " ${@bb.utils.contains("MACHINE_FEATURES", "sgx", "omap3-sgx-modules", "",d)}"
# rootfs images
# register image class for usage
diff --git a/conf/machine/phyboard-maia-am335x-1.conf b/conf/machine/phyboard-maia-am335x-1.conf
index b00744c..975cd0e 100644
--- a/conf/machine/phyboard-maia-am335x-1.conf
+++ b/conf/machine/phyboard-maia-am335x-1.conf
@@ -13,5 +13,4 @@ KERNEL_DEVICETREE = "am335x-maia-rdk.dtb"
BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
-MACHINE_FEATURES += "wlan"
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phyboard-wega-am335x-1.conf b/conf/machine/phyboard-wega-am335x-1.conf
index abaf546..1194c18 100644
--- a/conf/machine/phyboard-wega-am335x-1.conf
+++ b/conf/machine/phyboard-wega-am335x-1.conf
@@ -13,4 +13,4 @@ KERNEL_DEVICETREE = "am335x-wega-rdk.dtb"
BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-256mb.img"
-MACHINE_FEATURES += "wlan"
+MACHINE_FEATURES += "wlan sgx"
diff --git a/conf/machine/phyboard-wega-am335x-2.conf b/conf/machine/phyboard-wega-am335x-2.conf
index d04fad0..7099076 100644
--- a/conf/machine/phyboard-wega-am335x-2.conf
+++ b/conf/machine/phyboard-wega-am335x-2.conf
@@ -13,5 +13,4 @@ KERNEL_DEVICETREE = "am335x-wega-rdk.dtb"
BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-256mb.img"
-MACHINE_FEATURES += "wlan"
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen wlan sgx"
diff --git a/conf/machine/phyboard-wega-am335x-3.conf b/conf/machine/phyboard-wega-am335x-3.conf
index 762d945..07d02ae 100644
--- a/conf/machine/phyboard-wega-am335x-3.conf
+++ b/conf/machine/phyboard-wega-am335x-3.conf
@@ -13,6 +13,5 @@ KERNEL_DEVICETREE = "am335x-wega-eeprom-rtc-spi.dtb"
BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
-MACHINE_FEATURES += "wlan"
# touchscreen, the board may have one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen wlan sgx"
diff --git a/conf/machine/phyboard-wega-am335x-4.conf b/conf/machine/phyboard-wega-am335x-4.conf
index be08295..3565c8e 100644
--- a/conf/machine/phyboard-wega-am335x-4.conf
+++ b/conf/machine/phyboard-wega-am335x-4.conf
@@ -13,6 +13,5 @@ KERNEL_DEVICETREE = "am335x-wega-eeprom-rtc.dtb"
BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
-MACHINE_FEATURES += "wlan"
# touchscreen, the board may have one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen wlan sgx"
diff --git a/conf/machine/phycore-am335x-1.conf b/conf/machine/phycore-am335x-1.conf
index ab77603..61d7255 100644
--- a/conf/machine/phycore-am335x-1.conf
+++ b/conf/machine/phycore-am335x-1.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phycore-am335x-2.conf b/conf/machine/phycore-am335x-2.conf
index 9f17ba4..a7e73c7 100644
--- a/conf/machine/phycore-am335x-2.conf
+++ b/conf/machine/phycore-am335x-2.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-2x512mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phycore-am335x-3.conf b/conf/machine/phycore-am335x-3.conf
index 64262f0..17cb934 100644
--- a/conf/machine/phycore-am335x-3.conf
+++ b/conf/machine/phycore-am335x-3.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-256mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phycore-am335x-4.conf b/conf/machine/phycore-am335x-4.conf
index b1c68f4..8e2bf4f 100644
--- a/conf/machine/phycore-am335x-4.conf
+++ b/conf/machine/phycore-am335x-4.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi-no-eeprom.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-256mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phycore-am335x-5.conf b/conf/machine/phycore-am335x-5.conf
index 2a7fa60..c45c8ee 100644
--- a/conf/machine/phycore-am335x-5.conf
+++ b/conf/machine/phycore-am335x-5.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-256mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phycore-am335x-6.conf b/conf/machine/phycore-am335x-6.conf
index 8fa023f..df994d8 100644
--- a/conf/machine/phycore-am335x-6.conf
+++ b/conf/machine/phycore-am335x-6.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-1024mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phycore-am335x-7.conf b/conf/machine/phycore-am335x-7.conf
index c124c10..2ec255e 100644
--- a/conf/machine/phycore-am335x-7.conf
+++ b/conf/machine/phycore-am335x-7.conf
@@ -14,5 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
-MACHINE_FEATURES += "wlan"
+MACHINE_FEATURES += "touchscreen wlan sgx"
diff --git a/conf/machine/phyflex-am335x-1.conf b/conf/machine/phyflex-am335x-1.conf
index fb7addb..977770e 100644
--- a/conf/machine/phyflex-am335x-1.conf
+++ b/conf/machine/phyflex-am335x-1.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phyflex.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phyflex-mlo-256mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phyflex-am335x-2.conf b/conf/machine/phyflex-am335x-2.conf
index 9aa3111..d70e974 100644
--- a/conf/machine/phyflex-am335x-2.conf
+++ b/conf/machine/phyflex-am335x-2.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phyflex-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phyflex-mlo-256mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phyflex-am335x-3.conf b/conf/machine/phyflex-am335x-3.conf
index fd05586..c901647 100644
--- a/conf/machine/phyflex-am335x-3.conf
+++ b/conf/machine/phyflex-am335x-3.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phyflex-no-spi-no-eeprom.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phyflex-mlo-256mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"
diff --git a/conf/machine/phyflex-am335x-4.conf b/conf/machine/phyflex-am335x-4.conf
index 59a8c1c..851e282 100644
--- a/conf/machine/phyflex-am335x-4.conf
+++ b/conf/machine/phyflex-am335x-4.conf
@@ -14,4 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phyflex.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phyflex-mlo-512mb.img"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "touchscreen sgx"