diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2011-12-23 10:52:55 -0600 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2011-12-23 10:52:55 -0600 |
| commit | 408da10bc6858a73da9c70f5e6398a7bdaa0e4d6 (patch) | |
| tree | f6986028d60d23aa1629f824d3ed3f60e35eda18 | |
| parent | 1cbcbe6c389c712d7368ba171bd0b00fe8e32819 (diff) | |
| download | kernel-408da10bc6858a73da9c70f5e6398a7bdaa0e4d6.tar.gz kernel-408da10bc6858a73da9c70f5e6398a7bdaa0e4d6.tar.xz kernel-408da10bc6858a73da9c70f5e6398a7bdaa0e4d6.zip | |
clean up arm configs for new config options
| -rw-r--r-- | config-arm-generic | 5 | ||||
| -rw-r--r-- | config-arm-imx | 3 | ||||
| -rw-r--r-- | config-arm-omap-generic | 22 | ||||
| -rw-r--r-- | config-arm-tegra | 7 | ||||
| -rw-r--r-- | kernel.spec | 2 |
5 files changed, 37 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic index 3141e66a5..48568d9a7 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -152,6 +152,11 @@ CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MMC_SDHCI_PXAV2=m +CONFIG_ARM_APPENDED_DTB=y +CONFIG_MTD_OF_PARTS=y +CONFIG_PL330_DMA=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_ARM_ATAG_DTB_COMPAT is not set # CONFIG_FTGMAC100 is not set # CONFIG_FTMAC100 is not set diff --git a/config-arm-imx b/config-arm-imx index 5ed7ae2ed..2dbe10a1f 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -93,3 +93,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y + +CONFIG_PL310_ERRATA_769419=y +CONFIG_LEDS_RENESAS_TPU=y diff --git a/config-arm-omap-generic b/config-arm-omap-generic index 03913d36d..d623e1817 100644 --- a/config-arm-omap-generic +++ b/config-arm-omap-generic @@ -1061,3 +1061,25 @@ CONFIG_LIBCRC32C=y CONFIG_CRYSTALHD=m CONFIG_GPIO_GENERIC_PLATFORM=y + +CONFIG_MACH_OMAP_GENERIC=y +CONFIG_PL310_ERRATA_753970=y +CONFIG_ARM_CPU_TOPOLOGY=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y +CONFIG_ETHERNET=y +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_SENSORS_AD7314=m +CONFIG_REGULATOR_GPIO=y +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_PANEL_DVI=m +CONFIG_PANEL_PICODLP=m +CONFIG_USB_RENESAS_USBHS=m +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_LEDS_RENESAS_TPU=y +# CONFIG_OMAP_IOMMU is not set +CONFIG_USB_RENESAS_USBHS_HCD=m + diff --git a/config-arm-tegra b/config-arm-tegra index b131978d2..495e91e65 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -83,3 +83,10 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CRYSTALHD=m + +CONFIG_MACH_VENTANA=y +CONFIG_PL310_ERRATA_753970=y +CONFIG_ARM_CPU_TOPOLOGY=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y +CONFIG_LEDS_RENESAS_TPU=y diff --git a/kernel.spec b/kernel.spec index 00261c4cd..2efbf181a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -732,7 +732,6 @@ Patch20000: utrace.patch # Flattened devicetree support Patch21000: arm-omap-dt-compat.patch Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch -Patch21002: pci-fix-ats-compile.patch Patch21080: sysfs-msi-irq-per-device.patch @@ -1313,7 +1312,6 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch # ApplyPatch arm-omap-dt-compat.patch ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch -ApplyPatch pci-fix-ats-compile.patch # # bugfixes to drivers and filesystems |