From: Zheng Yang <zhengyang@rock-chips.com>
Date: Wed, 1 Jul 2015 07:11:30 +0000 (+0800)
Subject: rockchip_defconfig: support rk1000.
X-Git-Tag: firefly_0821_release~3954
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=88b3b00769df7dc2d43e91f3b55acf33ad44e7df;p=firefly-linux-kernel-4.4.55.git

rockchip_defconfig: support rk1000.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 7903a1192fcc..463c7e0297ab 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -51,6 +51,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_CMA=y
+CONFIG_ZSMALLOC=y
 CONFIG_SECCOMP=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
@@ -213,6 +214,7 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_DMA_CMA=y
+CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
@@ -391,8 +393,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_CAMSYS_DRV=y
-CONFIG_FLASHLIGHT=y
 CONFIG_LEDS_RT8547=y
 CONFIG_RK30_CAMERA_ONEFRAME=y
 CONFIG_MALI_MIDGARD=m
@@ -423,6 +423,8 @@ CONFIG_DP_ANX6345=y
 CONFIG_RK32_DP=y
 CONFIG_RK_HDMI=y
 CONFIG_RK_TVENCODER=y
+CONFIG_RK1000_TVOUT=y
+CONFIG_RK1000_TVOUT_CVBS=y
 CONFIG_RK3036_TV_ENCODER=y
 CONFIG_ROCKCHIP_RGA=y
 CONFIG_ROCKCHIP_RGA2=y
@@ -440,6 +442,7 @@ CONFIG_SND_RK_SOC_HDMI_I2S=y
 CONFIG_SND_RK_SOC_SPDIF_CARD=y
 CONFIG_SND_RK_SOC_RT5631=y
 CONFIG_SND_RK_SOC_RT3224=y
+CONFIG_SND_RK_SOC_RK1000=y
 CONFIG_SND_RK_SOC_RK3036=y
 CONFIG_SND_RK_SOC_RK312X=y
 CONFIG_HIDRAW=y
@@ -556,10 +559,7 @@ CONFIG_RTC_HYM8563=y
 CONFIG_RTC_RT5036=y
 CONFIG_RTC_DRV_RC5T619=y
 CONFIG_STAGING=y
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=y
 CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOGGER=y
 CONFIG_ANDROID_TIMED_GPIO=y
@@ -586,6 +586,7 @@ CONFIG_PWM=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RK_HEADSET=y
+CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_FS=y