Remove apm from machine features

APM (Advanced Power Management) is a more or less ancient power
management API mainly from the x86 world. There is an optional APM
emulation layer for ARM, and some platform make some extended use
of it (e.g. PXA). However, neither is the emulation enabled on any
NXP/Freescale kernel nor is it commonly used, hence remove it from
machine feature.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index ddd60285e45ed2ffed5f71623efcbd52e481a702..6ec1f14ff31d15b24a92b57b21a2cec88306d647 100644 (file)
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -14,4 +14,4 @@ UBOOT_MACHINE = "mx23evk_config"
 
 KERNEL_DEVICETREE = "imx23-evk.dtb"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat touchscreen"
+MACHINE_FEATURES = "usbgadget usbhost vfat touchscreen"

diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index c05ad8f69a7428360071cade4f2cb63d5422c6c7..ac4cef59eb733c1969658d896a727d35bed5452f 100644 (file)
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -20,7 +20,7 @@ KERNEL_DEVICETREE = "imx28-evk.dtb"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
 ## Parameters for NAND IC part-# K9LBG08U0D-PCB0
 

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d6069a72ba271c0e56f2c6841fc19055c3be0700..1d7993c58db64ebd7ea1183590c1fc8ae85d8cfb 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -166,7 +166,7 @@ SERIAL_CONSOLE_mxs = "115200 ttyAMA0"
 
 KERNEL_IMAGETYPE = "zImage"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"

diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index 40a98c081fc6473a37921d1448f6f2949ee2773a..dd5a21a22d0130c9145acfd0ef2362069b5431c8 100644 (file)
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -17,4 +17,4 @@ KERNEL_DEVICETREE = "vf610-twr.dtb"
 
 SERIAL_CONSOLE = "115200 ttyLP1"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"