rk3288 gpu : update GPU driver r4p0_eac version

[firefly-linux-kernel-4.4.55.git] / arch / arm / configs / rockchip_defconfig

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 65b0cda06099136b861ec0143b2389845a3557ba..38610083cc2db1d45271bb8323e488617af5b5ec 100755 (executable)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -34,6 +34,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_ROCKCHIP=y
+CONFIG_BLOCK_RKNAND=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_753970=y
@@ -209,7 +210,6 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_CMA=y
-CONFIG_BLOCK_RKNAND=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
@@ -333,10 +333,10 @@ CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_MALI_T6XX=y
-CONFIG_MALI_T6XX_DVFS=y
-CONFIG_MALI_T6XX_RT_PM=y
-CONFIG_MALI_T6XX_DEBUG_SYS=y
+CONFIG_MALI_MIDGARD=y
+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"