summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2012-11-20 12:13:10 +0530
committerJon Medhurst <tixy@linaro.org>2013-01-17 09:45:04 +0000
commit9f4750ec1a3b7c91f9328c145343a9ed499827a7 (patch)
treed44b5dde8a694991871b0359df4ef18030618ccb
parent28b9d25381e655b8a7c27ccb303173f3aaf0e43e (diff)
linaro/configs: origen: Enable mainline components
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--linaro/configs/origen.conf52
1 files changed, 2 insertions, 50 deletions
diff --git a/linaro/configs/origen.conf b/linaro/configs/origen.conf
index f331c5a99b2..0a1cec8c0ab 100644
--- a/linaro/configs/origen.conf
+++ b/linaro/configs/origen.conf
@@ -32,18 +32,9 @@ CONFIG_USB_PEGASUS=y
CONFIG_USB_USBNET=y
CONFIG_USB_NET_DM9601=y
CONFIG_USB_NET_MCS7830=y
-CONFIG_ATH_COMMON=y
-CONFIG_ATH_DEBUG=y
-CONFIG_ATH6KL=y
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_SDIO is not set
-# CONFIG_ATH6KL_USB is not set
-CONFIG_ATH6KL_PLATFORM_DATA=y
-CONFIG_ATH6KL_POLL=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_UNIDISPLAY_TS=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_SAMSUNG=y
@@ -57,12 +48,11 @@ CONFIG_SENSORS_EXYNOS4_TMU=y
CONFIG_POWER_SUPPLY=y
CONFIG_MFD_MAX8997=y
CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DUMMY=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_MAX8997=y
CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_SAMSUNG_S5P_FIMC=y
@@ -75,62 +65,24 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_SAMSUNG_S5P_G2D=y
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=y
CONFIG_VIDEO_SAMSUNG_S5P_MFC=y
-CONFIG_MALI400MP=y
-CONFIG_USING_PMM=y
-CONFIG_UMP=y
CONFIG_FB=y
CONFIG_FB_S3C=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y
-CONFIG_LCD_PWRCTRL=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_SAMSUNG=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_S5P=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_EXYNOS=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_S3C_HSOTG=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_G_PRINTER=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-CONFIG_USB_G_DBGP_PRINTK=y
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S3C=y
CONFIG_MMC_SDHCI_S3C_DMA=y
-CONFIG_STAGING=y
-CONFIG_SND_SOC_ORIGEN_ALC5625=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S3C=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_PERF_COUNTERS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_DEBUG_S3C_UART2=y