summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-08-17 15:51:28 -0700
committerOtavio Salvador <otavio@ossystems.com.br>2016-08-23 23:26:55 -0300
commita7b7185a560b2a63f8b94053267faaabf9bb804e (patch)
treee9304cfd73e64cfcb1858ab0bc9089bdfebcea52 /conf
parentb9f0d32081c6fa2348c2026d026bd2f5d3cea68b (diff)
downloadmeta-freescale-a7b7185a560b2a63f8b94053267faaabf9bb804e.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx23evk.conf2
-rw-r--r--conf/machine/imx28evk.conf2
-rw-r--r--conf/machine/include/imx-base.inc2
-rw-r--r--conf/machine/twr-vf65gs10.conf2
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index ddd60285..6ec1f14f 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -14,4 +14,4 @@ UBOOT_MACHINE = "mx23evk_config"
14 14
15KERNEL_DEVICETREE = "imx23-evk.dtb" 15KERNEL_DEVICETREE = "imx23-evk.dtb"
16 16
17MACHINE_FEATURES = "apm usbgadget usbhost vfat touchscreen" 17MACHINE_FEATURES = "usbgadget usbhost vfat touchscreen"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index c05ad8f6..ac4cef59 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -20,7 +20,7 @@ KERNEL_DEVICETREE = "imx28-evk.dtb"
20 20
21SERIAL_CONSOLE = "115200 ttyAMA0" 21SERIAL_CONSOLE = "115200 ttyAMA0"
22 22
23MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" 23MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
24 24
25## Parameters for NAND IC part-# K9LBG08U0D-PCB0 25## Parameters for NAND IC part-# K9LBG08U0D-PCB0
26 26
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d6069a72..1d7993c5 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -166,7 +166,7 @@ SERIAL_CONSOLE_mxs = "115200 ttyAMA0"
166 166
167KERNEL_IMAGETYPE = "zImage" 167KERNEL_IMAGETYPE = "zImage"
168 168
169MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" 169MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
170 170
171# Add the ability to specify _imx machines 171# Add the ability to specify _imx machines
172MACHINEOVERRIDES =. "imx:" 172MACHINEOVERRIDES =. "imx:"
diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index 40a98c08..dd5a21a2 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -17,4 +17,4 @@ KERNEL_DEVICETREE = "vf610-twr.dtb"
17 17
18SERIAL_CONSOLE = "115200 ttyLP1" 18SERIAL_CONSOLE = "115200 ttyLP1"
19 19
20MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" 20MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"