Revert "om-gta0{1, 2}.conf task-shr-minimal: remove apm from machine

features and add fso-apm to task-shr-minimal-base"

* Will do it distro specific....
* This reverts commit 1bfa409a3a28cee60c4800d3caf33ce3f100d4ca.

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 501d97968b1b0d75d935bf075e99c2e4a0bdb48e..5bdeba01f3f59a018546d2e7949d330e8776cb13 100644 (file)
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -19,7 +19,7 @@ UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 
-MACHINE_FEATURES = "kernel26 alsa bluetooth gps usbgadget usbhost phone vfat ext2"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 48e8119000c6d2518a9da300d09e76f0339d615d..d47320e59d41300c3338ea201b9beaef49f961ca 100644 (file)
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -24,7 +24,7 @@ UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 
-MACHINE_FEATURES = "kernel26 alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"

diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index 6239ef993aff1580e606c9da246d46053a14c034..c2eb32ad0034a9d52c7b8654a31831d8a1f73d4c 100644 (file)
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r17"
+PR = "r16"
 PV = "2.0"
 LICENSE = "GPL"