diff options
| -rw-r--r-- | Makefile.config | 10 | ||||
| -rw-r--r-- | config-arm-generic | 10 | ||||
| -rw-r--r-- | config-arm-kirkwood | 11 | ||||
| -rw-r--r-- | config-arm-omap | 13 | ||||
| -rw-r--r-- | config-arm-tegra | 9 | ||||
| -rw-r--r-- | config-armv7 | 30 | ||||
| -rw-r--r-- | kernel.spec | 29 |
7 files changed, 75 insertions, 37 deletions
diff --git a/Makefile.config b/Makefile.config index f95559d8b..777b30283 100644 --- a/Makefile.config +++ b/Makefile.config @@ -11,7 +11,6 @@ CONFIGFILES = \ $(CFG)-s390x.config \ $(CFG)-armv5tel-kirkwood.config \ $(CFG)-armv7l.config $(CFG)-armv7hl.config \ - $(CFG)-armv7l-imx.config $(CFG)-armv7hl-imx.config \ $(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \ $(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ @@ -51,9 +50,6 @@ temp-armv7l-tegra: config-arm-tegra temp-arm-generic temp-armv5tel-kirkwood: config-arm-kirkwood temp-arm-generic perl merge.pl $^ > $@ -temp-armv7l-imx: config-arm-imx temp-arm-generic - perl merge.pl $^ > $@ - temp-x86-32: config-x86-32-generic config-x86-generic perl merge.pl $^ > $@ @@ -129,9 +125,6 @@ kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7 perl merge.pl $^ arm > $@ -kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx - perl merge.pl $^ arm > $@ - kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap perl merge.pl $^ arm > $@ @@ -141,9 +134,6 @@ kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7 perl merge.pl $^ arm > $@ -kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx - perl merge.pl $^ arm > $@ - kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap perl merge.pl $^ arm > $@ diff --git a/config-arm-generic b/config-arm-generic index 9e97725af..f1806ef00 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -110,6 +110,7 @@ CONFIG_RFKILL_GPIO=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIO_GENERIC_PLATFORM=m CONFIG_PINCTRL_SINGLE=m +CONFIG_POWER_RESET_GPIO=y CONFIG_USB_ULPI=y @@ -134,7 +135,9 @@ CONFIG_SERIO_AMBAKMI=m CONFIG_I2C_NOMADIK=m CONFIG_ARM_SP805_WATCHDOG=m CONFIG_FB_ARMCLCD=m +CONFIG_FB_SSD1307=m CONFIG_MPCORE_WATCHDOG=m +CONFIG_BACKLIGHT_PWM=m CONFIG_MMC_ARMMMCI=m CONFIG_MMC_SDHCI_PLTFM=m @@ -293,22 +296,28 @@ CONFIG_PL310_ERRATA_753970=y CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m CONFIG_MFD_SYSCON=y +# CONFIG_MFD_TPS80031 is not set +# CONFIG_MFD_AS3711 is not set # CONFIG_MFD_SMSC is not set # CONFIG_MFD_DA9055 is not set # CONFIG_MFD_MAX8907 is not set CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m +# CONFIG_REGULATOR_DUMMY is not set CONFIG_REGULATOR_GPIO=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_FAN53555=m CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LP3972=m CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_MAX8973=m CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m @@ -317,6 +326,7 @@ CONFIG_EXTCON_GPIO=m # CONFIG_ARM_VIRT_EXT is not set # CONFIG_PINCTRL_EXYNOS4 is not set +# CONFIG_PINCTRL_EXYNOS5440 is not set # CONFIG_AUTO_ZRELADDR is not set # CONFIG_ASYMMETRIC_KEY_TYPE is not set diff --git a/config-arm-kirkwood b/config-arm-kirkwood index ff1dad7df..ac3bf6f61 100644 --- a/config-arm-kirkwood +++ b/config-arm-kirkwood @@ -15,20 +15,29 @@ CONFIG_MACH_GURUPLUG=y CONFIG_MACH_ICONNECT_DT=y CONFIG_MACH_IB62X0_DT=y CONFIG_MACH_INETSPACE_V2=y +CONFIG_MACH_INETSPACE_V2_DT=y CONFIG_MACH_IOMEGA_IX2_200_DT=y CONFIG_MACH_KM_KIRKWOOD_DT=y CONFIG_MACH_LSXL_DT=y +CONFIG_MACH_MPLCEC4_DT=y CONFIG_MACH_MV88F6281GTW_GE=y -CONFIG_MACH_NETSPACE_V2=y +CONFIG_MACH_NETSPACE_LITE_V2_DT=y CONFIG_MACH_NETSPACE_MAX_V2=y +CONFIG_MACH_NETSPACE_MAX_V2_DT=y +CONFIG_MACH_NETSPACE_MINI_V2_DT=y +CONFIG_MACH_NETSPACE_V2=y +CONFIG_MACH_NETSPACE_V2_DT=y CONFIG_MACH_NET2BIG_V2=y CONFIG_MACH_NET5BIG_V2=y +CONFIG_MACH_NSA310_DT=y +CONFIG_MACH_OPENBLOCKS_A6_DT=y CONFIG_MACH_OPENRD_BASE=y CONFIG_MACH_OPENRD_CLIENT=y CONFIG_MACH_OPENRD_ULTIMATE=y CONFIG_MACH_RD88F6192_NAS=y CONFIG_MACH_RD88F6281=y CONFIG_MACH_SHEEVAPLUG=y +CONFIG_MACH_TOPKICK_DT=y CONFIG_MACH_TS219=y CONFIG_MACH_TS219_DT=y CONFIG_MACH_TS41X=y diff --git a/config-arm-omap b/config-arm-omap index 68421b06e..71e400246 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -41,7 +41,7 @@ CONFIG_SOC_OMAP3430=y CONFIG_SOC_TI81XX=y CONFIG_SOC_AM33XX=y CONFIG_SOC_OMAPTI816X=y -CONFIG_SOC_OMAP5=y +# CONFIG_SOC_OMAP5 is not set CONFIG_OMAP_PACKAGE_CBB=y CONFIG_OMAP_PACKAGE_CBL=y CONFIG_OMAP_PACKAGE_CBS=y @@ -170,6 +170,7 @@ CONFIG_TOUCHSCREEN_TI_TSCADC=m CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_OMAP_WATCHDOG=y +CONFIG_CLK_TWL6040=m CONFIG_TWL4030_CORE=y CONFIG_TWL4030_MADC=m CONFIG_TWL4030_POWER=y @@ -297,9 +298,16 @@ CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_TWL4030_USB=y CONFIG_TWL6030_USB=y +CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_TWL4030=y +CONFIG_PWM_TIECAP=m +CONFIG_PWM_TIEHRPWM=m +CONFIG_PWM_TWL=m +CONFIG_PWM_TWL_LED=m + CONFIG_IR_RX51=m +CONFIG_BATTERY_RX51=m # CONFIG_TIDSPBRIDGE is not set # CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 @@ -333,7 +341,8 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m # CONFIG_MFD_AAT2870_CORE is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_PALMAS is not set -# CONFIG_REGULATOR_DUMMY is not set # CONFIG_REGULATOR_LP3972 is not set # CONFIG_REGULATOR_LP872X is not set +# CONFIG_OMAP2_DSS_DEBUG is not set +# CONFIG_OMAP2_DSS_DEBUGFS is not set diff --git a/config-arm-tegra b/config-arm-tegra index 894b5dbef..e4d1fe12f 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -76,11 +76,18 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m # CONFIG_SND_SOC_TEGRA30_I2S is not set CONFIG_MFD_NVEC=y +CONFIG_MFD_TPS80031=y + CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_POWER_SUPPLY=y CONFIG_NVEC_LEDS=y +CONFIG_NVEC_PAZ00=y + +CONFIG_PWM_TEGRA=m + +CONFIG_DRM_TEGRA=m CONFIG_CPU_PM=y CONFIG_ARM_CPU_SUSPEND=y @@ -95,3 +102,5 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_OF_GPIO=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y + +# CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/config-armv7 b/config-armv7 index e7e8e6b6c..20c3c4ac2 100644 --- a/config-armv7 +++ b/config-armv7 @@ -5,12 +5,18 @@ CONFIG_CPU_V7=y # CONFIG_ARCH_MULTI_V6 is not set CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MVEBU=y +# This is V6 so we'll eventually support it in v5 unified kernels +# CONFIG_ARCH_BCM is not set CONFIG_ARCH_HIGHBANK=y +CONFIG_ARCH_MVEBU=y +# CONFIG_ARCH_MXC is not set CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_SOCFPGA=y +CONFIG_ARCH_SUNXI=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_DT=y +# not enabling first round +# CONFIG_ARCH_ZYNQ is not set CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y @@ -88,6 +94,7 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_LSM_MMAP_MIN_ADDR=32768 @@ -151,6 +158,8 @@ CONFIG_AMBA_PL08X=y CONFIG_ARM_SP805_WATCHDOG=m # highbank +CONFIG_CPU_IDLE_CALXEDA=y + CONFIG_EDAC_HIGHBANK_MC=m CONFIG_EDAC_HIGHBANK_L2=m @@ -163,6 +172,7 @@ CONFIG_FB_ARMCLCD=m CONFIG_I2C_VERSATILE=m CONFIG_OC_ETM=y CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y +CONFIG_SENSORS_VEXPRESS=m # unknown and needs review CONFIG_ARM_AMBA=y @@ -174,9 +184,22 @@ CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_MV643XX_ETH=m CONFIG_I2C_MV64XXX=m CONFIG_PINCTRL_MVEBU=y +CONFIG_MVNETA=m + +# imx +CONFIG_BACKLIGHT_PWM=m +CONFIG_DRM_IMX=m +CONFIG_DRM_IMX_FB_HELPER=m +CONFIG_DRM_IMX_PARALLEL_DISPLAY=m +CONFIG_DRM_IMX_IPUV3_CORE=m +CONFIG_DRM_IMX_IPUV3=m +CONFIG_VIDEO_CODA=m + +CONFIG_INPUT_PWM_BEEPER=m # exynos # CONFIG_DRM_EXYNOS is not set +# CONFIG_PINCTRL_EXYNOS5440 is not set # picoxcell CONFIG_CRYPTO_DEV_PICOXCELL=m @@ -274,6 +297,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=m CONFIG_GPIO_EM=m CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m +CONFIG_POWER_RESET_GPIO=y CONFIG_RFKILL_GPIO=m CONFIG_SERIAL_8250_EM=m CONFIG_INPUT_GP2A=m @@ -284,6 +308,9 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_MTD_OF_PARTS=y # CONFIG_MG_DISK is not set +# Framebuffers +CONFIG_FB_SSD1307=m + # Regulator drivers CONFIG_REGULATOR_FAN53555=m # Needs work/investigation @@ -329,6 +356,7 @@ CONFIG_PERF_EVENTS=y # CONFIG_VIDEO_DM6446_CCDC is not set # CONFIG_PANEL_TAAL is not set # CONFIG_IR_RX51 is not set +# CONFIG_DRM_OMAP is not set # CONFIG_GENERIC_CPUFREQ_CPU0 is not set # CONFIG_GPIO_TWL6040 is not set diff --git a/kernel.spec b/kernel.spec index 92f286b6e..b666bc83d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -138,8 +138,6 @@ Summary: The Linux kernel %define with_tegra %{?_without_tegra: 0} %{?!_without_tegra: 1} # kernel-kirkwood (only valid for arm) %define with_kirkwood %{?_without_kirkwood: 0} %{?!_without_kirkwood: 1} -# kernel-imx (only valid for arm) -%define with_imx %{?_without_imx: 0} %{?!_without_imx: 1} # # Additional options for user-friendly one-off kernel building: # @@ -253,9 +251,8 @@ Summary: The Linux kernel %define with_pae 0 %endif -# kernel up (unified kernel target), tegra, omap and imx are only built on armv7 hfp/sfp +# kernel up (unified kernel target), tegra and omap are only built on armv7 hfp/sfp %ifnarch armv7hl armv7l -%define with_imx 0 %define with_omap 0 %define with_tegra 0 %endif @@ -604,7 +601,6 @@ Source105: config-arm-generic Source110: config-arm-omap Source111: config-arm-tegra Source112: config-arm-kirkwood -Source113: config-arm-imx # This file is intentionally left empty in the stock kernel. Its a nicety # added for those wanting to do custom rebuilds with altered config opts. @@ -742,9 +738,6 @@ Patch21004: arm-tegra-nvec-kconfig.patch Patch21005: arm-tegra-usb-no-reset-linux33.patch Patch21006: arm-tegra-sdhci-module-fix.patch -# ARM imx -Patch21008: arm-imx-fixdrm.patch - #rhbz 754518 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -1050,12 +1043,6 @@ on kernel bugs, as some of these options impact performance noticably. This package includes a version of the Linux kernel with support for marvell kirkwood based systems, i.e., guruplug, sheevaplug -%define variant_summary The Linux kernel compiled for freescale boards -%kernel_variant_package imx -%description imx -This package includes a version of the Linux kernel with support for -freescale based systems, i.e., efika smartbook. - %define variant_summary The Linux kernel compiled for TI-OMAP boards %kernel_variant_package omap %description omap @@ -1332,7 +1319,6 @@ ApplyPatch vmbugon-warnon.patch ApplyPatch arm-export-read_current_timer.patch ApplyPatch arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch # ApplyPatch arm-omapdrm-fixinc.patch -ApplyPatch arm-imx-fixdrm.patch # ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch # ApplyPatch arm-tegra-sdhci-module-fix.patch @@ -1820,10 +1806,6 @@ BuildKernel %make_target %kernel_image PAE BuildKernel %make_target %kernel_image kirkwood %endif -%if %{with_imx} -BuildKernel %make_target %kernel_image imx -%endif - %if %{with_omap} BuildKernel %make_target %kernel_image omap %endif @@ -2163,9 +2145,6 @@ fi}\ %kernel_variant_preun kirkwood %kernel_variant_post -v kirkwood -%kernel_variant_preun imx -%kernel_variant_post -v imx - %kernel_variant_preun omap %kernel_variant_post -v omap @@ -2313,7 +2292,6 @@ fi %kernel_variant_files %{with_pae} PAE %kernel_variant_files %{with_pae_debug} PAEdebug %kernel_variant_files %{with_kirkwood} kirkwood -%kernel_variant_files %{with_imx} imx %kernel_variant_files %{with_omap} omap %kernel_variant_files %{with_tegra} tegra @@ -2330,6 +2308,11 @@ fi # ||----w | # || || %changelog +* Sat Jan 5 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Initial update of ARM configs for 3.8 +- Enable DRM driver for tegra +- Drop separate imx kernel. Will be reintroduced soon in unified + * Fri Jan 04 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git1.1 - Linux v3.8-rc2-116-g5f243b9 |