From a7b7185a560b2a63f8b94053267faaabf9bb804e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 17 Aug 2016 15:51:28 -0700 Subject: 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 Signed-off-by: Otavio Salvador --- conf/machine/imx23evk.conf | 2 +- conf/machine/imx28evk.conf | 2 +- conf/machine/include/imx-base.inc | 2 +- conf/machine/twr-vf65gs10.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index ddd60285e..6ec1f14ff 100644 --- 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 c05ad8f69..ac4cef59e 100644 --- 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 d6069a72b..1d7993c58 100644 --- 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 40a98c081..dd5a21a22 100644 --- 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" -- cgit v1.2.3-54-g00ecf