summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv7-generic1
-rw-r--r--config-armv7-lpae14
-rw-r--r--kernel.spec3
3 files changed, 17 insertions, 1 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 057ea50d8..3e17eb532 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -127,6 +127,7 @@ CONFIG_OF=y
CONFIG_USE_OF=y
CONFIG_OF_DEVICE=y
CONFIG_OF_IRQ=y
+CONFIG_DMA_OF=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_PROC_DEVICETREE=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 7263d7608..8732c4bcd 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -51,12 +51,24 @@ CONFIG_ARM_EXYNOS_CPUFREQ=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_I2C_S3C2410=m
CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS5440=y
CONFIG_S3C2410_WATCHDOG=m
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
-CONFIG_FB_S3C=m
+CONFIG_DRM_EXYNOS=m
+CONFIG_DRM_EXYNOS_IOMMU=y
+CONFIG_DRM_EXYNOS_DMABUF=y
+CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_DRM_EXYNOS_G2D=y
+CONFIG_DRM_EXYNOS_IPP=y
+CONFIG_DRM_EXYNOS_FIMC=y
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_GSC=y
+# CONFIG_FB_S3C is not set
CONFIG_SND_SOC_SAMSUNG=m
CONFIG_USB_EHCI_S5P=y
CONFIG_USB_OHCI_EXYNOS=y
diff --git a/kernel.spec b/kernel.spec
index 397330928..ca62b35a0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2292,6 +2292,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Apr 1 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM LPAE updates
+
* Sun Mar 31 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Make tegra inherit armv7-generic, fix and re-enable tegra
- Enable SPI on ARM