On Thu, Aug 21, 2014 at 08:40:39PM +0100, Peter Robinson wrote: > Why are you sending this to the list when there's already a BZ? There's nothing really wrong with sending it to the list. As long as a patch shows up somewhere. josh > On Thu, Aug 21, 2014 at 8:33 PM, Nicolas Chauvet <kwizart@xxxxxxxxx> wrote: > > From: Stephen Warren <swarren@xxxxxxxxxxxxx> > > > > Move config options from config-armv7 cpu config options to > > config-armv7-generic so that they can be shared with kernel-lpae > > rhbz#1110963 > > --- > > config-armv7 | 60 ++----------------------------------------------- > > config-armv7-generic | 46 ++++++++++++++++++++++++++++++++++++++ > > config-armv7-lpae | 23 +++++++++++++++--- > > 3 files changed, 68 insertions(+), 61 deletions(-) > > > > diff --git a/config-armv7 b/config-armv7 > > index 21f56c6..a2afb2b 100644 > > --- a/config-armv7 > > +++ b/config-armv7 > > @@ -10,7 +10,7 @@ CONFIG_ARCH_OMAP4=y > > CONFIG_ARCH_PICOXCELL=y > > CONFIG_ARCH_QCOM=y > > CONFIG_ARCH_ROCKCHIP=y > > -CONFIG_ARCH_TEGRA=y > > +# CONFIG_ARCH_SOCFPGA is not set > > CONFIG_ARCH_U8500=y > > # CONFIG_ARCH_VIRT is not set > > CONFIG_ARCH_ZYNQ=y > > @@ -562,47 +562,16 @@ CONFIG_IIO_ST_SENSORS_I2C=m > > CONFIG_IIO_ST_SENSORS_SPI=m > > CONFIG_IIO_ST_SENSORS_CORE=m > > > > -# tegra > > +# Tegra > > +# (Options only needed by platforms that don't have LPAE): > > CONFIG_ARCH_TEGRA_2x_SOC=y > > CONFIG_ARCH_TEGRA_3x_SOC=y > > -CONFIG_ARCH_TEGRA_114_SOC=y > > -CONFIG_ARCH_TEGRA_124_SOC=y > > -CONFIG_ARM_TEGRA_CPUFREQ=y > > CONFIG_TEGRA20_MC=y > > -CONFIG_TEGRA30_MC=y > > -CONFIG_TRUSTED_FOUNDATIONS=y > > - > > -CONFIG_SERIAL_TEGRA=y > > - > > -CONFIG_AHCI_TEGRA=m > > - > > -CONFIG_PCI_TEGRA=y > > CONFIG_TEGRA_IOMMU_GART=y > > -CONFIG_TEGRA_IOMMU_SMMU=y > > -CONFIG_MMC_SDHCI_TEGRA=m > > -CONFIG_TEGRA_WATCHDOG=m > > -CONFIG_I2C_TEGRA=m > > -CONFIG_TEGRA_SYSTEM_DMA=y > > -CONFIG_TEGRA_EMC_SCALING_ENABLE=y > > -CONFIG_TEGRA_AHB=y > > -CONFIG_TEGRA20_APB_DMA=y > > -CONFIG_SPI_TEGRA114=m > > CONFIG_SPI_TEGRA20_SFLASH=m > > CONFIG_SPI_TEGRA20_SLINK=m > > -CONFIG_PWM_TEGRA=m > > CONFIG_MFD_MAX8907=m > > -CONFIG_KEYBOARD_TEGRA=m > > -CONFIG_PINCTRL_TEGRA=y > > -CONFIG_PINCTRL_TEGRA20=y > > -CONFIG_PINCTRL_TEGRA30=y > > -CONFIG_USB_EHCI_TEGRA=m > > -CONFIG_RTC_DRV_TEGRA=m > > -CONFIG_CRYPTO_DEV_TEGRA_AES=m > > - > > -CONFIG_SND_SOC_TEGRA=m > > CONFIG_SND_SOC_TEGRA_ALC5632=m > > -CONFIG_SND_SOC_TEGRA_MAX98090=m > > -CONFIG_SND_SOC_TEGRA_RT5640=m > > CONFIG_SND_SOC_TEGRA_TRIMSLICE=m > > CONFIG_SND_SOC_TEGRA_WM8753=m > > CONFIG_SND_SOC_TEGRA_WM8903=m > > @@ -610,10 +579,6 @@ CONFIG_SND_SOC_TEGRA_WM9712=m > > CONFIG_SND_SOC_TEGRA20_AC97=m > > CONFIG_SND_SOC_TEGRA20_DAS=m > > CONFIG_SND_SOC_TEGRA20_SPDIF=m > > -CONFIG_SND_SOC_TEGRA30_AHUB=m > > -CONFIG_SND_SOC_TEGRA30_I2S=m > > -CONFIG_SND_HDA_TEGRA=m > > - > > # AC100 (PAZ00) > > CONFIG_MFD_NVEC=y > > CONFIG_MFD_TPS80031=y > > @@ -626,25 +591,6 @@ CONFIG_MFD_TPS6586X=y > > CONFIG_GPIO_TPS6586X=y > > CONFIG_RTC_DRV_TPS6586X=m > > > > -# Jetson TK1 > > -CONFIG_PINCTRL_AS3722=y > > -CONFIG_POWER_RESET_AS3722=y > > -CONFIG_MFD_AS3722=y > > -CONFIG_REGULATOR_AS3722=m > > -CONFIG_RTC_DRV_AS3722=y > > - > > -CONFIG_TEGRA_HOST1X=m > > -CONFIG_TEGRA_HOST1X_FIREWALL=y > > -CONFIG_DRM_TEGRA=m > > -CONFIG_DRM_TEGRA_FBDEV=y > > -# CONFIG_DRM_TEGRA_DEBUG is not set > > -CONFIG_DRM_TEGRA_STAGING=y > > -CONFIG_DRM_PANEL=y > > -CONFIG_DRM_PANEL_SIMPLE=m > > -CONFIG_DRM_PANEL_LD9040=m > > -CONFIG_DRM_PANEL_S6E8AA0=m > > -CONFIG_NOUVEAU_PLATFORM_DRIVER=m > > - > > # OLPC XO > > CONFIG_SERIO_OLPC_APSP=m > > > > diff --git a/config-armv7-generic b/config-armv7-generic > > index 10ab6b6..07d53fd 100644 > > --- a/config-armv7-generic > > +++ b/config-armv7-generic > > @@ -54,6 +54,7 @@ CONFIG_IRQ_CROSSBAR=y > > CONFIG_ARCH_EXYNOS=y > > CONFIG_ARCH_HIGHBANK=y > > CONFIG_ARCH_SUNXI=y > > +CONFIG_ARCH_TEGRA=y > > CONFIG_ARCH_VEXPRESS_CA9X4=y > > CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y > > # CONFIG_ARCH_BCM is not set > > @@ -291,6 +292,51 @@ CONFIG_RTC_DRV_MAX8997=m > > CONFIG_RTC_DRV_MAX77686=m > > CONFIG_EXTCON_MAX8997=m > > > > +# Tegra > > +CONFIG_ARCH_TEGRA_114_SOC=y > > +CONFIG_ARCH_TEGRA_124_SOC=y > > +CONFIG_ARM_TEGRA_CPUFREQ=y > > +CONFIG_TEGRA30_MC=y > > +CONFIG_TRUSTED_FOUNDATIONS=y > > +CONFIG_SERIAL_TEGRA=y > > +CONFIG_AHCI_TEGRA=m > > +CONFIG_PCI_TEGRA=y > > +CONFIG_TEGRA_IOMMU_SMMU=y > > +CONFIG_MMC_SDHCI_TEGRA=m > > +CONFIG_TEGRA_WATCHDOG=m > > +CONFIG_I2C_TEGRA=m > > +CONFIG_TEGRA_SYSTEM_DMA=y > > +CONFIG_TEGRA_EMC_SCALING_ENABLE=y > > +CONFIG_TEGRA_AHB=y > > +CONFIG_TEGRA20_APB_DMA=y > > +CONFIG_SPI_TEGRA114=m > > +CONFIG_PWM_TEGRA=m > > +CONFIG_KEYBOARD_TEGRA=m > > +CONFIG_USB_EHCI_TEGRA=m > > +CONFIG_RTC_DRV_TEGRA=m > > +CONFIG_SND_SOC_TEGRA=m > > +CONFIG_SND_SOC_TEGRA_MAX98090=m > > +CONFIG_SND_SOC_TEGRA_RT5640=m > > +CONFIG_SND_SOC_TEGRA30_AHUB=m > > +CONFIG_SND_SOC_TEGRA30_I2S=m > > +CONFIG_SND_HDA_TEGRA=m > > +CONFIG_TEGRA_HOST1X=m > > +CONFIG_TEGRA_HOST1X_FIREWALL=y > > +CONFIG_DRM_TEGRA=m > > +CONFIG_DRM_TEGRA_FBDEV=y > > +# CONFIG_DRM_TEGRA_DEBUG is not set > > +CONFIG_DRM_TEGRA_STAGING=y > > +CONFIG_DRM_PANEL=y > > +CONFIG_DRM_PANEL_SIMPLE=m > > +CONFIG_DRM_PANEL_LD9040=m > > +CONFIG_DRM_PANEL_S6E8AA0=m > > +# Jetson TK1 > > +CONFIG_PINCTRL_AS3722=y > > +CONFIG_POWER_RESET_AS3722=y > > +CONFIG_MFD_AS3722=y > > +CONFIG_REGULATOR_AS3722=m > > +CONFIG_RTC_DRV_AS3722=y > > + > > # regmap > > CONFIG_REGMAP=y > > CONFIG_REGMAP_I2C=m > > diff --git a/config-armv7-lpae b/config-armv7-lpae > > index 7ad1fce..2536087 100644 > > --- a/config-armv7-lpae > > +++ b/config-armv7-lpae > > @@ -13,6 +13,7 @@ CONFIG_ARCH_VIRT=y > > # CONFIG_SOC_DRA7XX is not set > > # CONFIG_ARCH_ROCKCHIP is not set > > # CONFIG_ARCH_TEGRA is not set > > +# CONFIG_ARCH_SOCFPGA is not set > > # CONFIG_ARCH_ZYNQ is not set > > # CONFIG_ARCH_AXXIA is not set > > > > @@ -65,7 +66,21 @@ CONFIG_TI_DAVINCI_MDIO=m > > # CONFIG_SND_DAVINCI_SOC is not set > > # CONFIG_TI_SOC_THERMAL is not set > > > > -# CONFIG_TEGRA_HOST1X is not set > > -# CONFIG_DRM_PANEL_SIMPLE is not set > > -# CONFIG_DRM_PANEL_LD9040 is not set > > -# CONFIG_DRM_PANEL_S6E8AA0 is not set > > +# Tegra > > +# (Options only needed by platforms that don't have LPAE): > > +# CONFIG_ARCH_TEGRA_2x_SOC is not set > > +# CONFIG_ARCH_TEGRA_3x_SOC is not set > > +# CONFIG_TEGRA20_MC is not set > > +# CONFIG_TEGRA_IOMMU_GART is not set > > +# CONFIG_SPI_TEGRA20_SFLASH is not set > > +# CONFIG_SPI_TEGRA20_SLINK is not set > > +# CONFIG_MFD_MAX8907 is not set > > +# CONFIG_MFD_NVEC is not set > > +# CONFIG_SND_SOC_TEGRA_ALC5632 is not set > > +# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set > > +# CONFIG_SND_SOC_TEGRA_WM8753 is not set > > +# CONFIG_SND_SOC_TEGRA_WM8903 is not set > > +# CONFIG_SND_SOC_TEGRA_WM9712 is not set > > +# CONFIG_SND_SOC_TEGRA20_AC97 is not set > > +# CONFIG_SND_SOC_TEGRA20_DAS is not set > > +# CONFIG_SND_SOC_TEGRA20_SPDIF is not set > > -- > > 1.7.2.1 > > > _______________________________________________ > kernel mailing list > kernel@xxxxxxxxxxxxxxxxxxxxxxx > https://admin.fedoraproject.org/mailman/listinfo/kernel _______________________________________________ kernel mailing list kernel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/kernel
