summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic9
-rw-r--r--config-arm641
-rw-r--r--config-armv720
-rw-r--r--config-armv7-generic13
-rw-r--r--config-armv7-lpae2
-rw-r--r--kernel.spec3
6 files changed, 30 insertions, 18 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 85925237c..25144b506 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -35,6 +35,11 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_ARM_SP805_WATCHDOG=m
+
+# ARM VExpress
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_VEXPRESS_CONFIG=y
# Device tree
CONFIG_OF=y
@@ -73,10 +78,6 @@ CONFIG_MDIO_GPIO=m
# CONFIG_CRYPTO_TEST is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_XEN is not set
-
-# FIX ME
-# CONFIG_POWER_RESET_VEXPRESS is not set
-# CONFIG_VEXPRESS_CONFIG is not set
# CONFIG_DRM_RCAR_DU is not set
# CONFIG_DRM_SHMOBILE is not set
# CONFIG_MMC_DW_SOCFPGA is not set
diff --git a/config-arm64 b/config-arm64
index eaefec843..49e5f32a9 100644
--- a/config-arm64
+++ b/config-arm64
@@ -18,6 +18,7 @@ CONFIG_ARCH_XGENE=y
CONFIG_ARM64_64K_PAGES=y
CONFIG_ARM64=y
# CONFIG_ARM_DT_BL_CPUFREQ is not set
+CONFIG_ARM_SMMU=y
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
CONFIG_ASYNC_PQ=m
diff --git a/config-armv7 b/config-armv7
index 151dde64f..11bd54c9c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -139,6 +139,8 @@ CONFIG_OMAP_IOVMM=m
CONFIG_OMAP3_EMU=y
# CONFIG_OMAP3_SDRC_AC_TIMING is not set
CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
CONFIG_TI_ST=m
CONFIG_TI_EDMA=y
@@ -283,6 +285,19 @@ CONFIG_PANEL_LGPHILIPS_LB035Q02=m
CONFIG_PANEL_ACX565AKM=m
# CONFIG_PANEL_N8X0 is not set
+CONFIG_DISPLAY_ENCODER_TFP410=m
+CONFIG_DISPLAY_ENCODER_TPD12S015=m
+CONFIG_DISPLAY_CONNECTOR_DVI=m
+CONFIG_DISPLAY_CONNECTOR_HDMI=m
+CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
+CONFIG_DISPLAY_PANEL_DPI=m
+CONFIG_DISPLAY_PANEL_DSI_CM=m
+CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
+CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
+CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
+CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
+CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
+
# Enable V4L2 drivers for OMAP2+
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@ -453,6 +468,7 @@ CONFIG_STE_MODEM_RPROC=m
CONFIG_CW1200=m
CONFIG_CW1200_WLAN_SDIO=m
CONFIG_CW1200_WLAN_SPI=m
+CONFIG_UX500_WATCHDOG=m
# tegra
CONFIG_ARCH_TEGRA_2x_SOC=y
@@ -483,8 +499,8 @@ CONFIG_KEYBOARD_TEGRA=m
CONFIG_PINCTRL_TEGRA=y
CONFIG_PINCTRL_TEGRA20=y
CONFIG_PINCTRL_TEGRA30=y
-CONFIG_USB_EHCI_TEGRA=y
-CONFIG_RTC_DRV_TEGRA=y
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_RTC_DRV_TEGRA=m
CONFIG_SND_SOC_TEGRA=m
CONFIG_SND_SOC_TEGRA_ALC5632=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 685d275fe..0b12a279b 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -258,6 +258,7 @@ CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_PCI=m
CONFIG_SPI_DW_MMIO=m
CONFIG_SPI_DW_PCI=m
+CONFIG_MMC_DW_SOCFPGA=m
CONFIG_USB_DWC3=m
# CONFIG_MMC_DW_EXYNOS is not set
# CONFIG_MMC_DW_IDMAC is not set
@@ -460,15 +461,3 @@ CONFIG_BPF_JIT=y
# FIX ME
# CONFIG_FB_XILINX is not set
-# CONFIG_DISPLAY_ENCODER_TFP410 is not set
-# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
-# CONFIG_DISPLAY_CONNECTOR_DVI is not set
-# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
-# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
-# CONFIG_DISPLAY_PANEL_DPI is not set
-# CONFIG_DISPLAY_PANEL_DSI_CM is not set
-# CONFIG_DISPLAY_PANEL_SONY_ACX565AKM is not set
-# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01 is not set
-# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_DISPLAY_PANEL_NEC_NL8048HL11 is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index ce10b5384..6397847ea 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -13,6 +13,8 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_VIRTIO_CONSOLE=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_VIRTUALIZATION=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
# Cortex-A15
CONFIG_ARM_ERRATA_798181=y
diff --git a/kernel.spec b/kernel.spec
index 01bc42368..65932242a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2261,6 +2261,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sun Jul 14 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update ARM config
+
* Sun Jul 14 2013 Dennis Gilmore <dennis@ausil.us>
- update and reenable wandboard quad dtb patch