diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-05-03 11:21:48 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-05-03 11:21:48 +0100 |
| commit | 566e158188b14fa483a8a8155e1a5a7ba3500e12 (patch) | |
| tree | daf8cbf881559455c0b96c09dbe081ec2b166c7d /config-armv7-generic | |
| parent | 9c6ca1788c0fe07eea0cc9072f7eadfc85c89a3f (diff) | |
| download | kernel-566e158188b14fa483a8a8155e1a5a7ba3500e12.tar.gz kernel-566e158188b14fa483a8a8155e1a5a7ba3500e12.tar.xz kernel-566e158188b14fa483a8a8155e1a5a7ba3500e12.zip | |
ARM 3.10 merge and general cleanup, Drop dedicated tegra kernel as now Multiplatform enabled, Enable Tegra and UX500 (Snowball) in Multiplatform
Diffstat (limited to 'config-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index 2bde9bb1f..79b1534c7 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -2,6 +2,11 @@ # Generic ARM config options CONFIG_ARM=y +# CONFIG_ARCH_MULTI_V4 is not set +# CONFIG_ARCH_MULTI_V4T is not set +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y + CONFIG_CMDLINE="" CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y @@ -9,6 +14,7 @@ CONFIG_AEABI=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y + CONFIG_ARM_UNWIND=y CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y @@ -26,7 +32,6 @@ CONFIG_ATAGS=y CONFIG_ATAGS_PROC=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 - CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARCH_HAS_TICK_BROADCAST=y @@ -273,7 +278,6 @@ CONFIG_EEPROM_93XX46=m # MMC/SD CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SPI=m CONFIG_MMC_DW=m CONFIG_MMC_DW_PLTFM=m @@ -361,12 +365,12 @@ CONFIG_LCD_AMS369FG06=m CONFIG_LCD_LMS501KF03=m CONFIG_LCD_HX8357=m +# Input CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_GP2A=m CONFIG_INPUT_ARIZONA_HAPTICS=m CONFIG_INPUT_MC13783_PWRBUTTON=m - CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_AD7877=m CONFIG_TOUCHSCREEN_MC13783=m @@ -376,6 +380,18 @@ CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_BMP085_SPI=m +# Display + +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_CMA_AREAS=7 + # Ethernet CONFIG_KS8851=m CONFIG_ENC28J60=m @@ -450,6 +466,9 @@ CONFIG_PERF_EVENTS=y # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_AXI_CLKGEN is not set +# CONFIG_SPI_DW_PCI is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_PXA2XX is not set # these modules all fail with missing __bad_udelay # http://www.spinics.net/lists/arm/msg15615.html provides some background |