summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.config17
-rw-r--r--config-arm-generic15
-rw-r--r--config-arm-imx10
-rw-r--r--config-arm-kirkwood2
-rw-r--r--config-arm-omap29
-rw-r--r--config-armv739
-rw-r--r--kernel.spec27
7 files changed, 88 insertions, 51 deletions
diff --git a/Makefile.config b/Makefile.config
index 06d14e07a..f95559d8b 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,13 +9,11 @@ CONFIGFILES = \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config \
- $(CFG)-armv7.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)-armv7l-highbank.config $(CFG)-armv7hl-highbank.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \
$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config
@@ -44,9 +42,6 @@ temp-armv7: config-armv7 temp-generic
temp-arm-generic: config-arm-generic temp-generic
perl merge.pl $^ > $@
-temp-armv7l-versatile: config-arm-versatile temp-arm-generic
- perl merge.pl $^ > $@
-
temp-armv7l-omap: config-arm-omap temp-arm-generic
perl merge.pl $^ > $@
@@ -59,9 +54,6 @@ temp-armv5tel-kirkwood: config-arm-kirkwood temp-arm-generic
temp-armv7l-imx: config-arm-imx temp-arm-generic
perl merge.pl $^ > $@
-temp-armv7l-highbank: config-arm-highbank temp-arm-generic
- perl merge.pl $^ > $@
-
temp-x86-32: config-x86-32-generic config-x86-generic
perl merge.pl $^ > $@
@@ -131,9 +123,6 @@ kernel-$(VERSION)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@
-kernel-$(VERSION)-armv7.config: /dev/null temp-armv7
- perl merge.pl $^ armv7 > $@
-
kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
perl merge.pl $^ arm > $@
@@ -143,9 +132,6 @@ kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7
kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx
perl merge.pl $^ arm > $@
-kernel-$(VERSION)-armv7l-highbank.config: /dev/null temp-armv7l-highbank
- perl merge.pl $^ arm > $@
-
kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap
perl merge.pl $^ arm > $@
@@ -158,9 +144,6 @@ kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7
kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx
perl merge.pl $^ arm > $@
-kernel-$(VERSION)-armv7hl-highbank.config: /dev/null temp-armv7l-highbank
- 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 088a56ebb..e9c0e015d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -28,6 +28,7 @@ CONFIG_FPE_FASTFPE=y
CONFIG_HIGHPTE=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_UACCESS_WITH_MEMCPY=y
+# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
# Generic ARM Errata
CONFIG_ARM_ERRATA_720789=y
@@ -36,6 +37,7 @@ CONFIG_ARM_ERRATA_742230=y
CONFIG_ARM_ERRATA_742231=y
CONFIG_ARM_ERRATA_754327=y
CONFIG_ARM_ERRATA_764369=y
+CONFIG_ARM_ERRATA_775420=y
# Generic ARM config options
CONFIG_ZBOOT_ROM_TEXT=0
@@ -78,6 +80,9 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
# CONFIG_XEN is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCONF=y
+
CONFIG_THERMAL=y
CONFIG_ETHERNET=y
@@ -244,6 +249,7 @@ CONFIG_HW_RANDOM_EXYNOS=m
# Device tree
CONFIG_OF=y
CONFIG_USE_OF=y
+CONFIG_OF_IRQ=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_PROC_DEVICETREE=y
@@ -284,11 +290,16 @@ CONFIG_PL310_ERRATA_753970=y
CONFIG_MFD_88PM800=m
CONFIG_MFD_88PM805=m
CONFIG_MFD_SYSCON=y
+# 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_GPIO=m
CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_FAN53555=m
CONFIG_REGULATOR_ISL6271A=m
CONFIG_REGULATOR_MAX1586=m
CONFIG_REGULATOR_MAX8649=m
@@ -301,6 +312,9 @@ CONFIG_REGULATOR_TPS6507X=m
CONFIG_CHARGER_MANAGER=y
CONFIG_EXTCON_GPIO=m
+# CONFIG_ARM_VIRT_EXT is not set
+# CONFIG_PINCTRL_EXYNOS4 is not set
+
# CONFIG_AUTO_ZRELADDR is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
@@ -368,3 +382,4 @@ CONFIG_EXTCON_GPIO=m
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_CS89x0 is not set
+# CONFIG_DVB_USB_PCTV452E is not set
diff --git a/config-arm-imx b/config-arm-imx
index bddff88ab..090263ba3 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -7,6 +7,7 @@ CONFIG_NEON=y
# CONFIG_THUMB2_KERNEL is not set
CONFIG_CPU_FREQ_IMX=y
+CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_MACH_ARMADILLO5X0=y
@@ -67,6 +68,7 @@ CONFIG_I2C_IMX=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_MCP23S08=m
# CONFIG_GPIO_MC9S08DZ60 is not set
+CONFIG_PINCTRL_IMX35=y
CONFIG_PINCTRL_IMX51=y
CONFIG_PINCTRL_IMX53=y
CONFIG_USB_EHCI_MXC=y
@@ -77,6 +79,12 @@ CONFIG_MMC_MXC=m
CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_MXC=m
+# CONFIG_DRM_IMX is not set
+# 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_BACKLIGHT_PWM=m
CONFIG_LEDS_PWM=m
@@ -104,6 +112,8 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_PL310_ERRATA_769419=y
CONFIG_LEDS_RENESAS_TPU=y
+CONFIG_MFD_MAX8907=m
+
CONFIG_FB_IMX=m
# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index f03057852..ff1dad7df 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -51,6 +51,8 @@ CONFIG_LEDS_NETXBIG=m
CONFIG_RTC_DRV_MV=y
CONFIG_MV_XOR=y
CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_KIRKWOOD=y
# CONFIG_CPU_FEROCEON_OLD_ID is not set
# CONFIG_INPUT_GP2A is not set
diff --git a/config-arm-omap b/config-arm-omap
index 7716b2b7e..68421b06e 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -176,6 +176,7 @@ CONFIG_TWL4030_POWER=y
CONFIG_TWL4030_CODEC=y
CONFIG_TWL4030_WATCHDOG=m
CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
CONFIG_CHARGER_TWL4030=m
CONFIG_TWL6030_PWM=m
CONFIG_TWL6040_CORE=y
@@ -185,19 +186,23 @@ CONFIG_TI_DAVINCI_MDIO=m
CONFIG_TI_DAVINCI_CPDMA=m
CONFIG_LEDS_PWM=m
+CONFIG_LEDS_LP8788=m
CONFIG_MTD_ONENAND_OMAP2=y
CONFIG_HDQ_MASTER_OMAP=m
CONFIG_I2C_OMAP=m
CONFIG_SPI_OMAP24XX=y
CONFIG_MFD_OMAP_USB_HOST=y
CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LP8788=y
CONFIG_REGULATOR_TWL4030=y
+CONFIG_REGULATOR_LP8788=y
# Enable V4L2 drivers for OMAP2+
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_VPFE_CAPTURE=m
CONFIG_VIDEO_OMAP2_VOUT=m
+CONFIG_VIDEO_DM6446_CCDC=m
# CONFIG_VIDEO_OMAP3 is not set
# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
CONFIG_V4L_TEST_DRIVERS=y
@@ -228,6 +233,7 @@ CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
CONFIG_PANEL_TFP410=m
+CONFIG_PANEL_TAAL=m
CONFIG_PANEL_PICODLP=m
CONFIG_BACKLIGHT_PANDORA=m
@@ -240,21 +246,22 @@ CONFIG_PANEL_NEC_NL8048HL11_01B=y
CONFIG_PANEL_TPO_TD043MTEA1=y
CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_MCBSP=y
-CONFIG_SND_OMAP_SOC_MCPDM=y
-CONFIG_SND_OMAP_SOC_OVERO=y
-CONFIG_SND_OMAP_SOC_OMAP3EVM=y
-CONFIG_SND_OMAP_SOC_AM3517EVM=y
-CONFIG_SND_OMAP_SOC_SDP3430=y
-CONFIG_SND_OMAP_SOC_SDP4430=y
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
-CONFIG_SND_OMAP_SOC_ZOOM2=y
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_MCPDM=m
+CONFIG_SND_OMAP_SOC_OVERO=m
+CONFIG_SND_OMAP_SOC_OMAP3EVM=m
+CONFIG_SND_OMAP_SOC_AM3517EVM=m
+CONFIG_SND_OMAP_SOC_SDP3430=m
+CONFIG_SND_OMAP_SOC_SDP4430=m
+CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
+CONFIG_SND_OMAP_SOC_ZOOM2=m
CONFIG_SND_OMAP_SOC_IGEP0020=y
CONFIG_SND_OMAP_SOC_OMAP_HDMI=y
# Because alsa is modular http://www.spinics.net/lists/linux-omap/msg67307.html
# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_OMAP_SOC_RX51 is not set
# CONFIG_SND_SOC_ALL_CODECS is not set
@@ -292,6 +299,8 @@ CONFIG_TWL4030_USB=y
CONFIG_TWL6030_USB=y
CONFIG_RTC_DRV_TWL4030=y
+CONFIG_IR_RX51=m
+
# CONFIG_TIDSPBRIDGE is not set
# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
# CONFIG_TIDSPBRIDGE_DEBUG is not set
diff --git a/config-armv7 b/config-armv7
index c77f129fb..4a8caf8aa 100644
--- a/config-armv7
+++ b/config-armv7
@@ -25,7 +25,6 @@ CONFIG_VFPv3=y
CONFIG_NEON=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_VMSPLIT_2G=y
CONFIG_ARM_UNWIND=y
CONFIG_ARM_THUMB=y
CONFIG_ARM_THUMBEE=y
@@ -122,6 +121,8 @@ CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
+CONFIG_PINCTRL=y
+CONFIG_PINCONF=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
@@ -170,6 +171,7 @@ CONFIG_RTC_DRV_88PM80X=m
CONFIG_CRYPTO_DEV_MV_CESA=m
CONFIG_MV643XX_ETH=m
CONFIG_I2C_MV64XXX=m
+CONFIG_PINCTRL_MVEBU=y
# exynos
# CONFIG_DRM_EXYNOS is not set
@@ -184,6 +186,7 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m
# Device tree
CONFIG_OF=y
CONFIG_USE_OF=y
+CONFIG_OF_IRQ=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_PROC_DEVICETREE=y
@@ -250,6 +253,9 @@ CONFIG_MPCORE_WATCHDOG=m
CONFIG_MFD_T7L66XB=y
CONFIG_MFD_TC6387XB=y
CONFIG_MFD_SYSCON=y
+CONFIG_MFD_MAX8907=m
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_SMSC is not set
# RTC
CONFIG_RTC_DRV_SNVS=m
@@ -276,6 +282,8 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
CONFIG_MTD_OF_PARTS=y
# CONFIG_MG_DISK is not set
+# Regulator drivers
+CONFIG_REGULATOR_FAN53555=m
# Needs work/investigation
# CONFIG_ARM_CHARLCD is not set
@@ -306,7 +314,34 @@ CONFIG_THERMAL=y
# CONFIG_PATA_PLATFORM is not set
CONFIG_PERF_EVENTS=y
-
+# Defined config options we don't use yet
+# CONFIG_PINCTRL_IMX35 is not set
+# CONFIG_DRM_IMX_FB_HELPER is not set
+# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set
+# CONFIG_DRM_IMX_IPUV3_CORE is not set
+# CONFIG_DRM_IMX_IPUV3 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+
+# CONFIG_GPIO_TWL6040 is not set
+# CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_PANEL_TAAL is not set
+# CONFIG_IR_RX51 is not set
+
+# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
+# CONFIG_GPIO_TWL6040 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_IR_RX51 is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_PANEL_TAAL is not set
+# CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
+
+# CONFIG_DVB_USB_PCTV452E is not set
# We need to fix these as they should be either generic includes or kconfig fixes
# drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]
# CONFIG_TOUCHSCREEN_EETI is not set
diff --git a/kernel.spec b/kernel.spec
index 58f43a683..1e28e4275 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -140,8 +140,6 @@ Summary: The Linux kernel
%define with_kirkwood %{?_without_kirkwood: 0} %{?!_without_kirkwood: 1}
# kernel-imx (only valid for arm)
%define with_imx %{?_without_imx: 0} %{?!_without_imx: 1}
-# kernel-highbank (only valid for arm)
-%define with_highbank %{?_without_highbank: 0} %{?!_without_highbank: 1}
#
# Additional options for user-friendly one-off kernel building:
#
@@ -255,13 +253,12 @@ Summary: The Linux kernel
%define with_pae 0
%endif
-# kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hfp/sfp
+# kernel up (unified kernel target), tegra, omap and imx are only built on armv7 hfp/sfp
%ifnarch armv7hl armv7l
%define with_imx 0
%define with_omap 0
%define with_tegra 0
%endif
-%define with_highbank 0
# kernel-kirkwood is only built for armv5
%ifnarch armv5tel
@@ -600,8 +597,6 @@ Source110: config-arm-omap
Source111: config-arm-tegra
Source112: config-arm-kirkwood
Source113: config-arm-imx
-Source114: config-arm-highbank
-Source115: config-arm-versatile
# 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.
@@ -746,8 +741,6 @@ Patch21004: arm-tegra-nvec-kconfig.patch
Patch21005: arm-tegra-usb-no-reset-linux33.patch
Patch21006: arm-tegra-sdhci-module-fix.patch
-# ARM highbank patches
-
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1068,12 +1061,6 @@ marvell kirkwood based systems, i.e., guruplug, sheevaplug
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 Calxeda boards
-%kernel_variant_package highbank
-%description highbank
-This package includes a version of the Linux kernel with support for
-Calxeda based systems, i.e., HP arm servers.
-
%define variant_summary The Linux kernel compiled for TI-OMAP boards
%kernel_variant_package omap
%description omap
@@ -1851,10 +1838,6 @@ BuildKernel %make_target %kernel_image kirkwood
BuildKernel %make_target %kernel_image imx
%endif
-%if %{with_highbank}
-BuildKernel %make_target %kernel_image highbank
-%endif
-
%if %{with_omap}
BuildKernel %make_target %kernel_image omap
%endif
@@ -2197,9 +2180,6 @@ fi}\
%kernel_variant_preun imx
%kernel_variant_post -v imx
-%kernel_variant_preun highbank
-%kernel_variant_post -v highbank
-
%kernel_variant_preun omap
%kernel_variant_post -v omap
@@ -2348,7 +2328,6 @@ fi
%kernel_variant_files %{with_pae_debug} PAEdebug
%kernel_variant_files %{with_kirkwood} kirkwood
%kernel_variant_files %{with_imx} imx
-%kernel_variant_files %{with_highbank} highbank
%kernel_variant_files %{with_omap} omap
%kernel_variant_files %{with_tegra} tegra
@@ -2365,6 +2344,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Dec 11 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update ARM configs for latest 3.7
+- Drop highbank kernel build variant as its in unified kernel
+
* Tue Dec 11 2012 Josh Boyer <jwboyer@redhat.com>
- Fix IBSS scanning in mac80211 (rhbz 883414)