diff options
author | Denys Dmytriyenko <denys@ti.com> | 2017-03-02 02:50:43 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2017-03-01 21:03:45 -0500 |
commit | bea5fc9c09f2349e78b50b1fde6c093fed88bf08 (patch) | |
tree | e28e897f38850a346ff7a4c3a3aeadc90491d046 /conf/machine | |
parent | d7ce8563c59ab9843b5102178707e3dc34aebefb (diff) | |
download | meta-ti-bea5fc9c09f2349e78b50b1fde6c093fed88bf08.tar.gz |
conf/machine: deprecate opencl feature, introduce dsp feature
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/include/dra7xx.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/keystone.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/omap-a15.inc | 2 | ||||
-rw-r--r-- | conf/machine/k2e-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/k2g-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/k2hk-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/k2l-evm.conf | 2 |
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 @@ | |||
1 | require conf/machine/include/omap-a15.inc | 1 | require conf/machine/include/omap-a15.inc |
2 | SOC_FAMILY_append = ":dra7xx" | 2 | SOC_FAMILY_append = ":dra7xx" |
3 | 3 | ||
4 | MACHINE_FEATURES += "pci opencl" | 4 | MACHINE_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" | |||
23 | EXTRA_IMAGEDEPENDS += "u-boot" | 23 | EXTRA_IMAGEDEPENDS += "u-boot" |
24 | EXTRA_IMAGEDEPENDS += "boot-monitor" | 24 | EXTRA_IMAGEDEPENDS += "boot-monitor" |
25 | 25 | ||
26 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci" | 26 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp" |
27 | MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" | 27 | MACHINE_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" | |||
31 | UBI_VOLNAME = "rootfs" | 31 | UBI_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 |
34 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip" | 34 | MACHINE_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 | ||
5 | require conf/machine/include/k2e.inc | 5 | require conf/machine/include/k2e.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "opencl" | ||
8 | |||
9 | KERNEL_DEVICETREE = "keystone-k2e-evm.dtb" | 7 | KERNEL_DEVICETREE = "keystone-k2e-evm.dtb" |
10 | 8 | ||
11 | UBOOT_MACHINE = "k2e_evm_config" | 9 | UBOOT_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 | ||
5 | require conf/machine/include/k2g.inc | 5 | require conf/machine/include/k2g.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "alsa opencl" | 7 | MACHINE_FEATURES += "alsa" |
8 | 8 | ||
9 | KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb" | 9 | KERNEL_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 | ||
5 | require conf/machine/include/keystone.inc | 5 | require conf/machine/include/keystone.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "opencl" | ||
8 | |||
9 | KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb" | 7 | KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb" |
10 | 8 | ||
11 | UBOOT_MACHINE = "k2hk_evm_config" | 9 | UBOOT_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 | ||
5 | require conf/machine/include/keystone.inc | 5 | require conf/machine/include/keystone.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "opencl" | ||
8 | |||
9 | KERNEL_DEVICETREE = "keystone-k2l-evm.dtb" | 7 | KERNEL_DEVICETREE = "keystone-k2l-evm.dtb" |
10 | 8 | ||
11 | UBOOT_MACHINE = "k2l_evm_config" | 9 | UBOOT_MACHINE = "k2l_evm_config" |