diff options
| author | huangyuxuan01 <huangyuxuan01@live.com> | 2014-08-27 11:54:10 +0800 |
|---|---|---|
| committer | YuXuan Huang <huangyuxuan01@live.com> | 2014-08-28 00:41:11 +0000 |
| commit | 526d694698aa64aa9c8d3d9230e6f369631d0a9d (patch) | |
| tree | cee31b2ea203fff67f264e522cc85cc76642323f | |
| parent | 8245168f47a7ea62521b3bf7520059284de3311d (diff) | |
| download | kernel_samsung_smdk4412-526d694698aa64aa9c8d3d9230e6f369631d0a9d.zip kernel_samsung_smdk4412-526d694698aa64aa9c8d3d9230e6f369631d0a9d.tar.gz kernel_samsung_smdk4412-526d694698aa64aa9c8d3d9230e6f369631d0a9d.tar.bz2 | |
Fix kernel build errors for GT-N7000
defconfig: cyanogenmod_n7000_defconfig
Fix two mali400 drivers compile together
Use mali400 r3p2 driver,disabled mali r3p1 driver.
Change-Id: Ia6c4290414b3f97f57b38da41dae6107c4d9c657
| -rw-r--r-- | arch/arm/configs/cyanogenmod_n7000_defconfig | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/arch/arm/configs/cyanogenmod_n7000_defconfig b/arch/arm/configs/cyanogenmod_n7000_defconfig index f6cf27c..d7e0f57 100644 --- a/arch/arm/configs/cyanogenmod_n7000_defconfig +++ b/arch/arm/configs/cyanogenmod_n7000_defconfig @@ -2060,6 +2060,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_ZR364XX is not set # CONFIG_USB_STKWEBCAM is not set # CONFIG_USB_S2255 is not set +CONFIG_MALI_400MP_UMP=y CONFIG_VIDEO_SAMSUNG=y CONFIG_VIDEO_SAMSUNG_V4L2=y CONFIG_VIDEO_FIMC=y @@ -2088,21 +2089,6 @@ CONFIG_VIDEO_MFC5X=y CONFIG_VIDEO_MFC_MAX_INSTANCE=4 CONFIG_VIDEO_MFC_MEM_PORT_COUNT=2 # CONFIG_VIDEO_MFC5X_DEBUG is not set -CONFIG_VIDEO_MALI400MP=y -# CONFIG_MALI_DED_ONLY is not set -# CONFIG_MALI_DED_MMU is not set -CONFIG_MALI_OSMEM_ONLY=y -# CONFIG_MALI_DED_OSMEM is not set -# CONFIG_MALI_R3P1_LSI is not set -# CONFIG_VIDEO_MALI400MP_DEBUG is not set -CONFIG_VIDEO_MALI400MP_DVFS=y -CONFIG_VIDEO_UMP=y -# CONFIG_UMP_R3P1_LSI is not set -# CONFIG_UMP_DED_ONLY is not set -CONFIG_UMP_OSMEM_ONLY=y -# CONFIG_UMP_VCM_ONLY is not set -CONFIG_UMP_MEM_SIZE=1024 -# CONFIG_VIDEO_UMP_DEBUG is not set CONFIG_VIDEO_FIMG2D=y # CONFIG_VIDEO_FIMG2D_DEBUG is not set CONFIG_VIDEO_FIMG2D3X=y @@ -2139,12 +2125,20 @@ CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE=y # # Graphics support # + +# CONFIG_MALI_VER_BEFORE_R3P2 is not set # CONFIG_DRM is not set CONFIG_ION=y CONFIG_ION_EXYNOS=y CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=71680 # CONFIG_ION_EXYNOS_CONTIGHEAP_DEBUG is not set -# CONFIG_VGASTATE is not set +CONFIG_MALI400=y +CONFIG_MALI_VER_R3P2=y +# CONFIG_MALI400_DEBUG is not set +# CONFIG_MALI400_PROFILING is not set +CONFIG_MALI_DVFS=y +CONFIG_MALI400_UMP=y +# CONFIG_MALI_SHARED_INTERRUPTS is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set |