summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2017-03-02 02:50:43 +0000
committerDenys Dmytriyenko <denys@ti.com>2017-03-01 21:03:45 -0500
commitbea5fc9c09f2349e78b50b1fde6c093fed88bf08 (patch)
treee28e897f38850a346ff7a4c3a3aeadc90491d046 /conf
parentd7ce8563c59ab9843b5102178707e3dc34aebefb (diff)
downloadmeta-ti-bea5fc9c09f2349e78b50b1fde6c093fed88bf08.tar.gz
conf/machine: deprecate opencl feature, introduce dsp feature
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/dra7xx.inc2
-rw-r--r--conf/machine/include/keystone.inc2
-rw-r--r--conf/machine/include/omap-a15.inc2
-rw-r--r--conf/machine/k2e-evm.conf2
-rw-r--r--conf/machine/k2g-evm.conf2
-rw-r--r--conf/machine/k2hk-evm.conf2
-rw-r--r--conf/machine/k2l-evm.conf2
7 files changed, 4 insertions, 10 deletions
diff --git a/conf/machine/include/dra7xx.inc b/conf/machine/include/dra7xx.inc
index 42941fd7..857e1b35 100644
--- a/conf/machine/include/dra7xx.inc
+++ b/conf/machine/include/dra7xx.inc
@@ -1,4 +1,4 @@
1require conf/machine/include/omap-a15.inc 1require conf/machine/include/omap-a15.inc
2SOC_FAMILY_append = ":dra7xx" 2SOC_FAMILY_append = ":dra7xx"
3 3
4MACHINE_FEATURES += "pci opencl" 4MACHINE_FEATURES += "pci"
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
index dd1cbae9..51ef5632 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -23,5 +23,5 @@ UBI_VOLNAME = "rootfs"
23EXTRA_IMAGEDEPENDS += "u-boot" 23EXTRA_IMAGEDEPENDS += "u-boot"
24EXTRA_IMAGEDEPENDS += "boot-monitor" 24EXTRA_IMAGEDEPENDS += "boot-monitor"
25 25
26MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci" 26MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp"
27MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" 27MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index a4344561..d5ce54ac 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -31,4 +31,4 @@ MACHINE_GUI_CLASS = "smallscreen"
31UBI_VOLNAME = "rootfs" 31UBI_VOLNAME = "rootfs"
32 32
33# List common SoC features, may need to add touchscreen for specific machines 33# List common SoC features, may need to add touchscreen for specific machines
34MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip" 34MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip dsp"
diff --git a/conf/machine/k2e-evm.conf b/conf/machine/k2e-evm.conf
index 530e6dcb..95b0e428 100644
--- a/conf/machine/k2e-evm.conf
+++ b/conf/machine/k2e-evm.conf
@@ -4,8 +4,6 @@
4 4
5require conf/machine/include/k2e.inc 5require conf/machine/include/k2e.inc
6 6
7MACHINE_FEATURES += "opencl"
8
9KERNEL_DEVICETREE = "keystone-k2e-evm.dtb" 7KERNEL_DEVICETREE = "keystone-k2e-evm.dtb"
10 8
11UBOOT_MACHINE = "k2e_evm_config" 9UBOOT_MACHINE = "k2e_evm_config"
diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf
index d7bf609f..458dfe40 100644
--- a/conf/machine/k2g-evm.conf
+++ b/conf/machine/k2g-evm.conf
@@ -4,7 +4,7 @@
4 4
5require conf/machine/include/k2g.inc 5require conf/machine/include/k2g.inc
6 6
7MACHINE_FEATURES += "alsa opencl" 7MACHINE_FEATURES += "alsa"
8 8
9KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb" 9KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb"
10 10
diff --git a/conf/machine/k2hk-evm.conf b/conf/machine/k2hk-evm.conf
index c753e688..6adb0160 100644
--- a/conf/machine/k2hk-evm.conf
+++ b/conf/machine/k2hk-evm.conf
@@ -4,8 +4,6 @@
4 4
5require conf/machine/include/keystone.inc 5require conf/machine/include/keystone.inc
6 6
7MACHINE_FEATURES += "opencl"
8
9KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb" 7KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb"
10 8
11UBOOT_MACHINE = "k2hk_evm_config" 9UBOOT_MACHINE = "k2hk_evm_config"
diff --git a/conf/machine/k2l-evm.conf b/conf/machine/k2l-evm.conf
index 7a544923..b4721d0c 100644
--- a/conf/machine/k2l-evm.conf
+++ b/conf/machine/k2l-evm.conf
@@ -4,8 +4,6 @@
4 4
5require conf/machine/include/keystone.inc 5require conf/machine/include/keystone.inc
6 6
7MACHINE_FEATURES += "opencl"
8
9KERNEL_DEVICETREE = "keystone-k2l-evm.dtb" 7KERNEL_DEVICETREE = "keystone-k2l-evm.dtb"
10 8
11UBOOT_MACHINE = "k2l_evm_config" 9UBOOT_MACHINE = "k2l_evm_config"