[morty/master][PATCH 1/2] k2g-ice: remove separate config in favor of generic k2g-evm

[morty/master][PATCH 1/2] k2g-ice: remove separate config in favor of generic k2g-evm

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 conf/machine/k2g-ice.conf | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 conf/machine/k2g-ice.conf

diff --git a/conf/machine/k2g-ice.conf b/conf/machine/k2g-ice.conf
deleted file mode 100644
index 6998b3f..0000000
--- a/conf/machine/k2g-ice.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 2 K2G ICE machine
-#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G ICE
-
-require conf/machine/k2g-evm.conf
-
-UBOOT_MACHINE = "k2g_ice_config"
-- 
2.7.4

[morty/master][PATCH 2/2] conf/machine: deprecate opencl feature, introduce dsp feature

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 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 42941fd..857e1b3 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 dd1cbae..51ef563 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 a434456..d5ce54a 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 530e6dc..95b0e42 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 d7bf609..458dfe4 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 c753e68..6adb016 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 7a54492..b4721d0 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"
-- 
2.7.4