From ba671d2db1a67978395400ba62fd1ff32db9e0e1 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Sun, 11 Jan 2015 22:31:16 +0100 Subject: [PATCH] perf: Only disable perf events for machines using 2.6.35.3. Newer kernels build fine with the default settings. Signed-off-by: Alex Gonzalez Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/machine/imx28evk.conf | 3 +++ meta-fsl-arm/conf/machine/imx51evk.conf | 3 +++ meta-fsl-arm/conf/machine/imx53ard.conf | 3 +++ meta-fsl-arm/conf/machine/imx53qsb.conf | 3 +++ meta-fsl-arm/conf/machine/include/imx-base.inc | 3 --- meta-fsl-arm/conf/machine/include/mxs-base.inc | 3 --- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/meta-fsl-arm/conf/machine/imx28evk.conf b/meta-fsl-arm/conf/machine/imx28evk.conf index 86123c31..672e4587 100644 --- a/meta-fsl-arm/conf/machine/imx28evk.conf +++ b/meta-fsl-arm/conf/machine/imx28evk.conf @@ -8,6 +8,9 @@ include conf/machine/include/mxs-base.inc SOC_FAMILY = "mxs:mx28" +# Disable perf features as 2.6.35.3 fails to build otherwise +PERF_FEATURES_ENABLE = "" + IMXBOOTLETS_MACHINE = "iMX28_EVK" UBOOT_CONFIG ??= "sd" diff --git a/meta-fsl-arm/conf/machine/imx51evk.conf b/meta-fsl-arm/conf/machine/imx51evk.conf index d9aea7c0..9d7d06ca 100644 --- a/meta-fsl-arm/conf/machine/imx51evk.conf +++ b/meta-fsl-arm/conf/machine/imx51evk.conf @@ -9,6 +9,9 @@ include conf/machine/include/tune-cortexa8.inc SOC_FAMILY = "mx5:mx51" +# Disable perf features as 2.6.35.3 fails to build otherwise +PERF_FEATURES_ENABLE = "" + KERNEL_DEVICETREE = "imx51-babbage.dtb" UBOOT_MACHINE = "mx51evk_config" diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf index 8a64e22b..c338d6b5 100644 --- a/meta-fsl-arm/conf/machine/imx53ard.conf +++ b/meta-fsl-arm/conf/machine/imx53ard.conf @@ -9,6 +9,9 @@ include conf/machine/include/tune-cortexa8.inc SOC_FAMILY = "mx5:mx53" +# Disable perf features as 2.6.35.3 fails to build otherwise +PERF_FEATURES_ENABLE = "" + KERNEL_DEVICETREE = "imx53-ard.dtb" UBOOT_MACHINE = "mx53ard_config" diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf index 5df85a9e..0e7349e8 100644 --- a/meta-fsl-arm/conf/machine/imx53qsb.conf +++ b/meta-fsl-arm/conf/machine/imx53qsb.conf @@ -9,6 +9,9 @@ include conf/machine/include/tune-cortexa8.inc SOC_FAMILY = "mx5:mx53" +# Disable perf features as 2.6.35.3 fails to build otherwise +PERF_FEATURES_ENABLE = "" + KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" UBOOT_MACHINE = "mx53loco_config" diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index 63fad408..21e47386 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/conf/machine/include/imx-base.inc @@ -6,9 +6,6 @@ include conf/machine/include/fsl-default-providers.inc include conf/machine/include/soc-family.inc -# Disable perf features as 2.6.35.3 fail to build otherwise -PERF_FEATURES_ENABLE = "" - # Set specific make target and binary suffix UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX ?= "imx" diff --git a/meta-fsl-arm/conf/machine/include/mxs-base.inc b/meta-fsl-arm/conf/machine/include/mxs-base.inc index 40cfa0f1..03149520 100644 --- a/meta-fsl-arm/conf/machine/include/mxs-base.inc +++ b/meta-fsl-arm/conf/machine/include/mxs-base.inc @@ -15,9 +15,6 @@ UBOOT_ENTRYPOINT = "0x40008000" UBOOT_MAKE_TARGET = "u-boot.sb" UBOOT_SUFFIX = "sb" -# Disable perf features as 2.6.35.3 fail to build otherwise -PERF_FEATURES_ENABLE_mx28 = "" - XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-video-fbdev" -- 2.40.1