From: xxm <xxm@rock-chips.com>
Date: Tue, 15 Jul 2014 07:15:26 +0000 (+0800)
Subject: rockchip:mali400:mali400 built-in kernel
X-Git-Tag: firefly_0821_release~4916^2~235
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1cc95094674d255e2076d1b7be4063b7c695bef9;p=firefly-linux-kernel-4.4.55.git

rockchip:mali400:mali400 built-in kernel
---

diff --git a/arch/arm/configs/rk3036_defconfig b/arch/arm/configs/rk3036_defconfig
index 4d6c85253038..597f6067de3d 100644
--- a/arch/arm/configs/rk3036_defconfig
+++ b/arch/arm/configs/rk3036_defconfig
@@ -336,13 +336,12 @@ CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_MALI_MIDGARD=m
-CONFIG_MALI_MIDGARD_DVFS=y
-CONFIG_MALI_MIDGARD_RT_PM=y
-CONFIG_MALI_MIDGARD_DEBUG_SYS=y
-CONFIG_MALI_EXPERT=y
-CONFIG_MALI_DEBUG_SHADER_SPLIT_FS=y
-CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
+CONFIG_MALI400=y
+CONFIG_MALI400_DEBUG=y
+# CONFIG_MALI400_PROFILING is not set
+CONFIG_MALI400_UMP=y
+CONFIG_MALI_SHARED_INTERRUPTS=y
+CONFIG_UMP=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set