Permalink
Browse files

v1.5.4-cm10 config

  • Loading branch information...
gokhanmoral committed Sep 17, 2012
1 parent 216be35 commit 4b67c7f31cf8da4de76147983ac6a69aaa7e724d
Showing with 26 additions and 16 deletions.
  1. +25 −15 arch/arm/configs/siyah_defconfig
  2. +1 −1 drivers/video/samsung/s3cfb.h
@@ -37,13 +37,13 @@ CONFIG_HAVE_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE="/usr/local/arm/arm-eabi-4.4.3/bin/arm-eabi-"
-CONFIG_LOCALVERSION="-Siyah-s3-v1.5.3"
+CONFIG_LOCALVERSION="-Siyah-1.5.4-cm10"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
@@ -705,14 +705,14 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PEGASUSQ=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
+CONFIG_CPU_FREQ_GOV_HOTPLUG=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_GOV_ONDEMAND_FLEXRATE is not set
# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set
CONFIG_CPU_FREQ_GOV_PEGASUSQ=y
-CONFIG_CPU_FREQ_GOV_LULZACTIVEQ=y
+CONFIG_CPU_FREQ_GOV_LULZACTIVEQ=m
# CONFIG_CPU_FREQ_DVFS_MONITOR is not set
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -1169,6 +1169,10 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_SYNC=y
+CONFIG_SW_SYNC=y
+CONFIG_SW_SYNC_USER=y
+# CONFIG_DMA_CMA is not set
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
# CONFIG_PARPORT is not set
@@ -1256,6 +1260,9 @@ CONFIG_LINK_DEVICE_HSIC=y
# CONFIG_IPC_CMC22x_OLD_RFS is not set
# CONFIG_SIPC_VER_5 is not set
# CONFIG_SIM_DETECT is not set
+CONFIG_CPU_UNDERVOLTING=m
+CONFIG_MALI_CONTROL=m
+CONFIG_M0_MODS=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -2030,6 +2037,7 @@ CONFIG_VIDEO_TVOUT_5_1CH_AUDIO=y
CONFIG_HDMI_EARJACK_MUTE=y
CONFIG_HDMI_HPD=y
# CONFIG_HDMI_CONTROLLED_BY_EXT_IC is not set
+# CONFIG_HDMI_TX_STRENGTH is not set
CONFIG_HDMI_SWITCH_HPD=y
CONFIG_HDMI_14A_3D=y
CONFIG_HDMI_PHY_32N=y
@@ -2052,9 +2060,7 @@ CONFIG_VIDEO_MALI400MP=y
CONFIG_MALI_OSMEM_ONLY=y
# CONFIG_MALI_DED_OSMEM is not set
# CONFIG_VIDEO_MALI400MP_DEBUG is not set
-# CONFIG_VIDEO_MALI400MP_STREAMLINE_PROFILING is not set
CONFIG_VIDEO_MALI400MP_DVFS=y
-CONFIG_GPU_CLOCK_CONTROL=y
CONFIG_VIDEO_FIMG2D=y
# CONFIG_VIDEO_FIMG2D_DEBUG is not set
CONFIG_VIDEO_FIMG2D4X=y
@@ -2067,15 +2073,15 @@ CONFIG_JPEG_V2_1=y
# Reserved memory configurations
#
CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC0=62464
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1=14336
+CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1=15360
CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC2=0
CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC3=0
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_MFC_SECURE=28672
+CONFIG_VIDEO_SAMSUNG_MEMSIZE_MFC_SECURE=50176
CONFIG_VIDEO_SAMSUNG_MEMSIZE_MFC_NORMAL=4096
CONFIG_VIDEO_SAMSUNG_MEMSIZE_JPEG=0
CONFIG_VIDEO_SAMSUNG_MEMSIZE_TVOUT=0
CONFIG_VIDEO_EXYNOS=y
-CONFIG_VIDEO_EXYNOS_MEMSIZE_FIMC_IS=10240
+CONFIG_VIDEO_EXYNOS_MEMSIZE_FIMC_IS=12080
CONFIG_EXYNOS_MEDIA_DEVICE=y
CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
@@ -2110,7 +2116,7 @@ CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE=y
# CONFIG_DRM is not set
CONFIG_ION=y
CONFIG_ION_EXYNOS=y
-CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=48128
+CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=71680
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
@@ -2137,6 +2143,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# Frame buffer hardware drivers
#
CONFIG_FB_S5P=y
+# CONFIG_FB_S5P_SYSMMU is not set
CONFIG_FB_S5P_SPLASH_SCREEN=y
# CONFIG_FB_S5P_LCD_INIT is not set
# CONFIG_FB_S5P_DEBUG is not set
@@ -2149,16 +2156,22 @@ CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMD=8192
CONFIG_FB_S5P_MDNIE=y
# CONFIG_FB_MDNIE_PWM is not set
CONFIG_FB_S5P_MIPI_DSIM=y
+CONFIG_FB_BGRA_ORDER=y
+# CONFIG_FB_RGBA_ORDER is not set
# CONFIG_FB_S5P_S6C1372 is not set
# CONFIG_FB_S5P_LD9040 is not set
+# CONFIG_FB_S5P_LMS501XX is not set
# CONFIG_FB_S5P_DUMMY_MIPI_LCD is not set
CONFIG_FB_S5P_S6E8AA0=y
+# CONFIG_FB_S5P_EA8061 is not set
+# CONFIG_FB_S5P_S6EVR02 is not set
# CONFIG_FB_S5P_S6D6AA1 is not set
# CONFIG_FB_S5P_S6E63M0 is not set
# CONFIG_S6E8AA0_AMS529HA01 is not set
CONFIG_S6E8AA0_AMS480GYXX=y
CONFIG_AID_DIMMING=y
CONFIG_LCD_FREQ_SWITCH=y
+CONFIG_MDNIE_MOD=m
CONFIG_FB_S5P_EXTDSP=y
# CONFIG_FB_S5P_EXTDSP_DEBUG is not set
CONFIG_FB_S5P_EXTDSP_NR_BUFFERS=3
@@ -2743,7 +2756,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_XVMALLOC=y
CONFIG_ZRAM=y
# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZRAM_FOR_ANDROID=y
# CONFIG_FB_SM7XX is not set
# CONFIG_LIRC_STAGING is not set
# CONFIG_EASYCAP is not set
@@ -2797,9 +2809,7 @@ CONFIG_ACCESSORY=y
# CONFIG_SAMSUNG_MHL_9290 is not set
# CONFIG_IR_REMOCON is not set
# CONFIG_EXTCON is not set
-CONFIG_MOBICORE_SUPPORT=y
-# CONFIG_MOBICORE_DEBUG is not set
-CONFIG_MOBICORE_API=y
+# CONFIG_MOBICORE_SUPPORT is not set
CONFIG_IOMMU_SUPPORT=y
#
@@ -368,7 +368,7 @@ struct s3c_reg_data {
#define S3CFB_SET_ALPHA_MODE _IOW('F', 313, unsigned int)
extern struct fb_ops s3cfb_ops;
-extern inline struct s3cfb_global *get_fimd_global(int id);
+extern struct s3cfb_global *get_fimd_global(int id);
/* S3CFB */
extern struct s3c_platform_fb *to_fb_plat(struct device *dev);

0 comments on commit 4b67c7f

Please sign in to comment.