From 860b1af6cf70435dc3a4bcda2ea0d9ee71813fd4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 2 Feb 2012 16:42:51 -0600 Subject: [PATCH] Arm config cleanup disable TOUCHSCREEN_EGALAX on arm arches build in CACHE_L2X0 on the imx kernel dont build the module for imx21 usb since its not something we support --- config-arm-generic | 3 ++- config-arm-imx | 4 ++-- kernel.spec | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index 76714a7c5..fb2a7355d 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -188,7 +188,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768 # drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] # CONFIG_TOUCHSCREEN_EETI is not set - +# CONFIG_TOUCHSCREEN_EGALAX is not set +# # FIXME: Guesses, need checking # CONFIG_MACH_EUKREA_CPUIMX35SD is not set CONFIG_ARM_ERRATA_720789=y diff --git a/config-arm-imx b/config-arm-imx index 5bb963335..e28c2cb55 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -33,7 +33,7 @@ CONFIG_MXC_IRQ_PRIOR=y CONFIG_MXC_PWM=m CONFIG_MXC_DEBUG_BOARD=y # CONFIG_CPU_BPREDICT_DISABLE is not set -# CONFIG_CACHE_L2X0 is not set +CONFIG_CACHE_L2X0=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_ERRATA_411920=y CONFIG_PL310_ERRATA_588369=y @@ -56,7 +56,7 @@ CONFIG_DVB_TDA1004X=m CONFIG_DVB_PLL=m CONFIG_SND_IMX_SOC=m CONFIG_USB_EHCI_MXC=y -CONFIG_USB_IMX21_HCD=m +# CONFIG_USB_IMX21_HCD is not set CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_MXC=m CONFIG_RTC_MXC=m diff --git a/kernel.spec b/kernel.spec index 98f32fcff..5666c34fa 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2286,6 +2286,11 @@ fi # ||----w | # || || %changelog +* Thu Feb 02 2012 Dennis Gilmore +- disable TOUCHSCREEN_EGALAX on arm arches +- build in CACHE_L2X0 on the imx kernel +- dont build the module for imx21 usb since its not something we support + * Thu Feb 03 2012 Josh Boyer - 3.3.0-0.rc2.git2.1 - Linux 3.3-rc2-git2 (upstream 24b36da33c64368775f4ef9386d44dce1d2bc8cf)