diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2012-10-05 08:12:12 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2012-10-05 08:12:47 +0100 |
| commit | 8c0399628afc54985b89fd8c856f442a110230b8 (patch) | |
| tree | e5cc975f65d2444c4baf0d350744d42a21ae9808 | |
| parent | bac708def625cbe9235b18a6f6e005a5d9334c3b (diff) | |
| download | kernel-8c0399628afc54985b89fd8c856f442a110230b8.tar.gz kernel-8c0399628afc54985b89fd8c856f442a110230b8.tar.xz kernel-8c0399628afc54985b89fd8c856f442a110230b8.zip | |
Build MMC in on OMAP and Tegra until we work out why modules don't work
| -rw-r--r-- | config-arm-generic | 7 | ||||
| -rw-r--r-- | config-arm-kirkwood | 4 | ||||
| -rw-r--r-- | config-arm-omap | 9 | ||||
| -rw-r--r-- | config-arm-tegra | 8 | ||||
| -rw-r--r-- | kernel.spec | 3 |
5 files changed, 31 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic index 5f4fbf42b..e2e6a7714 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -19,6 +19,8 @@ CONFIG_SMP_ON_UP=y CONFIG_ARM_ARCH_TIMER=y +CONFIG_CMDLINE="" + # CONFIG_FPE_NWFPE is not set CONFIG_FPE_FASTFPE=y @@ -32,12 +34,15 @@ CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ATAGS_PROC=y +#CONFIG_XIP_KERNEL is not set + # DeviceTree CONFIG_USE_OF=y # CONFIG_OF_SELFTEST is not set CONFIG_PROC_DEVICETREE=y CONFIG_ARM_APPENDED_DTB=y CONFIG_I2C_MUX_PINCTRL=m +CONFIG_ARM_ATAG_DTB_COMPAT=y # Generic options we want for ARM that aren't defualt CONFIG_HIGHMEM=y @@ -116,6 +121,8 @@ CONFIG_GENERIC_GPIO=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_PHYSMAP_OF=y # CONFIG_MTD_AFS_PARTS is not set CONFIG_MTD_CHAR=m CONFIG_MTD_BLKDEVS=m diff --git a/config-arm-kirkwood b/config-arm-kirkwood index 4d6dbf8c9..7b5d758e4 100644 --- a/config-arm-kirkwood +++ b/config-arm-kirkwood @@ -2,15 +2,19 @@ CONFIG_ARCH_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD_DT=y # CONFIG_SMP is not set # CONFIG_VFP is not set + CONFIG_MACH_DB88F6281_BP=y CONFIG_MACH_RD88F6192_NAS=y CONFIG_MACH_RD88F6281=y CONFIG_MACH_MV88F6281GTW_GE=y CONFIG_MACH_SHEEVAPLUG=y CONFIG_MACH_ESATA_SHEEVAPLUG=y +CONFIG_MACH_DLINK_KIRKWOOD_DT=y CONFIG_MACH_GURUPLUG=y CONFIG_MACH_DREAMPLUG_DT=y CONFIG_MACH_DOCKSTAR=y +CONFIG_MACH_ICONNECT_DT=y +CONFIG_MACH_IB62X0_DT=y CONFIG_MACH_TS219=y CONFIG_MACH_TS41X=y CONFIG_MACH_OPENRD_BASE=y diff --git a/config-arm-omap b/config-arm-omap index b698e4849..ae328f190 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -247,6 +247,15 @@ CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_GADGET_OMAP is not set # CONFIG_ISP1301_OMAP is not set + +# This block is temporary until we work out why the MMC modules don't work as modules +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF=y +CONFIG_MMC_SPI=y + CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_TWL4030_USB=y diff --git a/config-arm-tegra b/config-arm-tegra index 5ec5a6762..015af431d 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -27,6 +27,14 @@ CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_I2C_TEGRA=y +# This block is temporary until we work out why the MMC modules don't work as modules +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF=y +CONFIG_MMC_SPI=y + CONFIG_MMC_SDHCI_TEGRA=y # CONFIG_RCU_BOOST is not set diff --git a/kernel.spec b/kernel.spec index 46875df10..c3797935c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2321,6 +2321,9 @@ fi # ||----w | # || || %changelog +* Fri Oct 5 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- Build MMC in on OMAP and Tegra until we work out why modules don't work + * Wed Oct 03 2012 Adam Jackson <ajax@redhat.com> - Drop vgem patches, not doing anything yet. |