summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2014-05-08 08:06:34 (GMT)
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 05:29:30 (GMT)
commitcec25d3c15ee55d6967b25e9daa3cbefc1d2a87b (patch)
treefffe0cd6ea3b462523d305e2eae6ce4a31760dd3
parente02de649862812565666bb822f6ac05712d55305 (diff)
downloadlinux-3.10-cec25d3c15ee55d6967b25e9daa3cbefc1d2a87b.zip
linux-3.10-cec25d3c15ee55d6967b25e9daa3cbefc1d2a87b.tar.gz
linux-3.10-cec25d3c15ee55d6967b25e9daa3cbefc1d2a87b.tar.bz2
Tizen: update defconfig for Odroid X2 and U3 boards
New defconfig supports both Odroid X2 and U3, so renamed it tizen_odroid_defconfig Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: I19c966f05e92292ededd2f910cbf1190b5b2c45f
-rwxr-xr-xarch/arm/configs/tizen_odroid_defconfig (renamed from arch/arm/configs/tizen_odroidx2_defconfig)32
1 files changed, 23 insertions, 9 deletions
diff --git a/arch/arm/configs/tizen_odroidx2_defconfig b/arch/arm/configs/tizen_odroid_defconfig
index 820be51..36081d1 100755
--- a/arch/arm/configs/tizen_odroidx2_defconfig
+++ b/arch/arm/configs/tizen_odroid_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.19 Kernel Configuration
+# Linux/arm 3.10.33 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -488,6 +488,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_CLEANCACHE is not set
# CONFIG_FRONTSWAP is not set
# CONFIG_ZBUD is not set
+# CONFIG_ZSMALLOC is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -742,6 +743,7 @@ CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
@@ -898,6 +900,7 @@ CONFIG_SCSI_LOWLEVEL=y
CONFIG_MD=y
# CONFIG_BLK_DEV_MD is not set
# CONFIG_BCACHE is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
CONFIG_DM_CRYPT=m
@@ -1723,6 +1726,7 @@ CONFIG_MALI400_UMP=y
CONFIG_MALI_DVFS=y
CONFIG_SLP_MALI_DBG=y
CONFIG_DRM=y
+CONFIG_DRM_MIPI_DSI=y
CONFIG_DRM_KMS_HELPER=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
@@ -1736,6 +1740,8 @@ CONFIG_DRM_EXYNOS=y
CONFIG_DRM_EXYNOS_IOMMU=y
CONFIG_DRM_EXYNOS_DMABUF=y
CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS_DPI=y
+CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_EXYNOS_HDMI=y
# CONFIG_DRM_EXYNOS_VIDI is not set
# CONFIG_DRM_EXYNOS_G2D is not set
@@ -1744,6 +1750,14 @@ CONFIG_DRM_EXYNOS_FIMC=y
# CONFIG_DRM_EXYNOS_ROTATOR is not set
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_TILCDC is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_LD9040 is not set
+# CONFIG_DRM_PANEL_S6E8AA0 is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_VIDEOMODE_HELPERS=y
@@ -1782,9 +1796,7 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_SIMPLE=y
-CONFIG_EXYNOS_VIDEO=y
-CONFIG_EXYNOS_MIPI_DSI=y
-CONFIG_EXYNOS_DP=y
+# CONFIG_EXYNOS_VIDEO is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_DISPLAY_CORE is not set
@@ -1874,6 +1886,7 @@ CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
CONFIG_HID_CHERRY=y
CONFIG_HID_CHICONY=y
+# CONFIG_HID_PRODIKEYS is not set
CONFIG_HID_CYPRESS=y
# CONFIG_HID_DRAGONRISE is not set
# CONFIG_HID_EMS_FF is not set
@@ -2078,6 +2091,7 @@ CONFIG_USB_F_SUBSET=y
CONFIG_USB_F_RNDIS=y
# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
@@ -2086,6 +2100,7 @@ CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_FUNCTIONFS is not set
# CONFIG_USB_MASS_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_G_SLP is not set
# CONFIG_USB_CDC_COMPOSITE is not set
@@ -2232,7 +2247,6 @@ CONFIG_DMA_OF=y
#
# DMA Clients
#
-# CONFIG_NET_DMA is not set
# CONFIG_ASYNC_TX_DMA is not set
# CONFIG_DMATEST is not set
# CONFIG_AUXDISPLAY is not set
@@ -2257,8 +2271,8 @@ CONFIG_STAGING=y
# CONFIG_R8712U is not set
# CONFIG_RTS5139 is not set
# CONFIG_TRANZPORT is not set
+# CONFIG_LINE6_USB is not set
# CONFIG_VT6656 is not set
-# CONFIG_ZSMALLOC is not set
# CONFIG_USB_ENESTORAGE is not set
# CONFIG_BCM_WIMAX is not set
# CONFIG_FT1000 is not set
@@ -2336,9 +2350,9 @@ CONFIG_GIC_NON_BANKED=y
#
CONFIG_GENERIC_PHY=y
# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
-CONFIG_PHY_EXYNOS_USB=y
-CONFIG_PHY_EXYNOS4210_USB=y
-CONFIG_PHY_EXYNOS4212_USB=y
+CONFIG_PHY_SAMSUNG_USB2=y
+CONFIG_PHY_EXYNOS4210_USB2=y
+CONFIG_PHY_EXYNOS4X12_USB2=y
CONFIG_EXYNOS_PHY=y
#