From bea5fc9c09f2349e78b50b1fde6c093fed88bf08 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 2 Mar 2017 02:50:43 +0000 Subject: conf/machine: deprecate opencl feature, introduce dsp feature Signed-off-by: Denys Dmytriyenko --- conf/machine/include/dra7xx.inc | 2 +- conf/machine/include/keystone.inc | 2 +- conf/machine/include/omap-a15.inc | 2 +- conf/machine/k2e-evm.conf | 2 -- conf/machine/k2g-evm.conf | 2 +- conf/machine/k2hk-evm.conf | 2 -- 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 @@ require conf/machine/include/omap-a15.inc SOC_FAMILY_append = ":dra7xx" -MACHINE_FEATURES += "pci opencl" +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" EXTRA_IMAGEDEPENDS += "u-boot" EXTRA_IMAGEDEPENDS += "boot-monitor" -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp" 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" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip" +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 @@ require conf/machine/include/k2e.inc -MACHINE_FEATURES += "opencl" - KERNEL_DEVICETREE = "keystone-k2e-evm.dtb" 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 @@ require conf/machine/include/k2g.inc -MACHINE_FEATURES += "alsa opencl" +MACHINE_FEATURES += "alsa" KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb" 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 @@ require conf/machine/include/keystone.inc -MACHINE_FEATURES += "opencl" - KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb" 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 @@ require conf/machine/include/keystone.inc -MACHINE_FEATURES += "opencl" - KERNEL_DEVICETREE = "keystone-k2l-evm.dtb" UBOOT_MACHINE = "k2l_evm_config" -- cgit v1.2.3-54-g00ecf