temporary

AndreiLux · Apr 16, 2015 · 9468bf8 · 9468bf8
1 parent 8cc9039
commit 9468bf8
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 29 deletions.
diff --git a/arch/arm/configs/perseus5433-trelte_defconfig b/arch/arm/configs/perseus5433-trelte_defconfig
@@ -4,7 +4,7 @@
 #
 
 CONFIG_CROSS_COMPILE="/home/af/S4/Toolchains/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-"
-CONFIG_LOCALVERSION="-perseus-helsinkiprime-alpha13"
+CONFIG_LOCALVERSION="-perseus-helsinkiprime-alpha15"
 
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -197,6 +197,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_MODULES_USE_ELF_REL=y
@@ -380,8 +381,14 @@ CONFIG_EXYNOS_SPI_RESET_DURING_DSTOP=y
 CONFIG_TARGET_LOCALE_EUR=y
 # CONFIG_TARGET_LOCALE_KOR is not set
 CONFIG_TIMA=y
+CONFIG_TIMA_LKMAUTH=y
 # CONFIG_TIMA_RKP is not set
+CONFIG_KNOX_KAP=y
+# CONFIG_TIMA_LKMAUTH_CODE_PROT is not set
 # CONFIG_TIMA_TEST_INFRA is not set
+# CONFIG_MSM_HSIC_SYSMON is not set
+# CONFIG_SEC_SMART_MGR_RUNQUEUE_AVG is not set
+# CONFIG_EXYNOS_RUN_QUEUE_STATS is not set
 
 #
 # Processor Type
@@ -540,6 +547,7 @@ CONFIG_TIGHT_PGDAT_BALANCE=y
 CONFIG_ZOOM_KILLER=y
 CONFIG_OOM_SCAN_WA_PREVENT_WRONG_SEARCH=y
 CONFIG_SDP_CACHE_CLEANUP=y
+CONFIG_MIN_DIRTY_THRESH_PAGES=7680
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -557,7 +565,7 @@ CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
-CONFIG_CMDLINE="selinux=0 enforcing=0"
+CONFIG_CMDLINE="selinux=1 enforcing=0"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 CONFIG_CMDLINE_EXTEND=y
 # CONFIG_XIP_KERNEL is not set
@@ -815,7 +823,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
 # CONFIG_NETFILTER_XT_TARGET_HL is not set
 # CONFIG_NETFILTER_XT_TARGET_HMARK is not set
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+CONFIG_NETFILTER_XT_TARGET_LOG=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NETMAP=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -871,6 +879,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 # CONFIG_NETFILTER_XT_MATCH_RECENT is not set
 CONFIG_NETFILTER_XT_MATCH_SCTP=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y
+CONFIG_NETFILTER_XT_TARGET_LOG=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
 CONFIG_NETFILTER_XT_MATCH_STRING=y
@@ -1229,7 +1238,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_PCH_PHUB is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
-CONFIG_TIMA_LOG=y
+# CONFIG_TIMA_LOG is not set
 CONFIG_LED_COVER=y
 # CONFIG_C2PORT is not set
 
@@ -1304,6 +1313,7 @@ CONFIG_MUIC_RUSTPROOF_ON_USER=y
 # CONFIG_MUIC_FSA9480 is not set
 CONFIG_MUIC_MAX77843=y
 CONFIG_HV_MUIC_MAX77843_AFC=y
+CONFIG_MUIC_MAX77843_IGNORE_ADCERR_WA=y
 CONFIG_MUIC_MAX77843_RESET_WA=y
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -1417,6 +1427,9 @@ CONFIG_DM_VERITY=y
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
 
+# KAP mode defines
+CONFIG_KNOX_KAP=y
+
 #
 # IEEE 1394 (FireWire) support
 #
@@ -1782,6 +1795,7 @@ CONFIG_INPUT_MOUSE=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_INPUT_EXPANDED_ABS is not set
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
@@ -1935,7 +1949,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 #
 # DIAG traffic over USB
 #
-# CONFIG_DIAG_OVER_USB is not set
+CONFIG_DIAG_OVER_USB=y
 
 #
 # SDIO support for DIAG
@@ -2152,7 +2166,8 @@ CONFIG_GPIO_ARIZONA=y
 # USB GPIO expanders:
 #
 CONFIG_W1=y
-CONFIG_W1_KTHREAD=y
+# CONFIG_W1_KTHREAD is not set
+CONFIG_W1_DETECT_PIN=y
 # CONFIG_W1_WORKQUEUE is not set
 # CONFIG_W1_CF is not set
 
@@ -2540,7 +2555,8 @@ CONFIG_VIDEO_EXYNOS_MFC=y
 CONFIG_EXYNOS_MFC_V8=y
 CONFIG_VIDEO_EXYNOS_HEVC=y
 CONFIG_VIDEO_EXYNOS_FIMC_IS=y
-# CONFIG_CAMERA_EEPROM_SUPPORT is not set
+# CONFIG_CAMERA_EEPROM_SUPPORT_REAR is not set
+# CONFIG_CAMERA_EEPROM_SUPPORT_FRONT is not set
 CONFIG_COMPANION_USE=y
 CONFIG_OIS_USE=y
 CONFIG_OIS_FW_UPDATE_THREAD_USE=y
@@ -2749,7 +2765,7 @@ CONFIG_DECON_LCD=y
 # CONFIG_DECON_LCD_S6E3FA2 is not set
 CONFIG_DECON_MDNIE_LITE=y
 CONFIG_LCD_HMT=y
-CONFIG_LCD_ALPM=y
+# CONFIG_LCD_ALPM is not set
 CONFIG_LCD_PCD=y
 CONFIG_S5P_DEV_MIPI_DSIM0=y
 
@@ -2833,7 +2849,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
 # CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -2945,7 +2961,6 @@ CONFIG_SND_SAMSUNG_AUX_HDMI=y
 # CONFIG_SND_USE_ANALOG_MIC is not set
 CONFIG_SND_USE_3MICS=y
 # CONFIG_SND_SAMSUNG_COMPENSATE_EXT_RES is not set
-CONFIG_SND_SOC_SAMSUNG_PACIFIC_EAX=y
 CONFIG_SND_SAMSUNG_SEIREN=y
 # CONFIG_SND_SAMSUNG_SEIREN_DEBUG is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
@@ -3993,7 +4008,6 @@ CONFIG_GPS_BCM4773=y
 CONFIG_MOBICORE_DRIVER=y
 # CONFIG_MOBICORE_DEBUG is not set
 CONFIG_MOBICORE_API=y
-CONFIG_SECURE_OS_CONTROL=y
 CONFIG_TRUSTONIC_TRUSTED_UI=y
 CONFIG_TRUSTONIC_TRUSTED_UI_FB_BLANK=y
 CONFIG_SECURE_OS_BOOSTER_API=y
@@ -4080,10 +4094,12 @@ CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FAT_VIRTUAL_XATTR=y
+CONFIG_FAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0"
 CONFIG_FAT_SUPPORT_STLOG=y
 CONFIG_EXFAT_FS=y
 CONFIG_EXFAT_VIRTUAL_XATTR=y
 CONFIG_EXFAT_SUPPORT_STLOG=y
+CONFIG_SEC_SELINUX=y
 # CONFIG_NTFS_FS is not set
 
 #
@@ -4350,22 +4366,23 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 # CONFIG_SECURITY_PATH is not set
 CONFIG_LSM_MMAP_MIN_ADDR=4096
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
-# CONFIG_SECURITY_SELINUX_DEVELOP is not set
-# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
-# CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_SEC_SELINUX=y
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_YAMA is not set
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
-# CONFIG_DEFAULT_SECURITY is not set
+CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_CRYPTO=y
 
 #
@@ -4535,3 +4552,15 @@ CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
 # CONFIG_VIRTUALIZATION is not set
+
+# SEC BSP
+CONFIG_SEC_BSP=y
+
+CONFIG_SECCOMP=y
+
+# RKP 
+CONFIG_STRICT_MEMORY_RWX=n
+CONFIG_TIMA_RKP=n
+CONFIG_HYP_RKP=n
+CONFIG_TIMA_LKMAUTH_CODE_PROT=n
+
diff --git a/arch/arm/configs/perseus5433-trhplte_defconfig b/arch/arm/configs/perseus5433-trhplte_defconfig
@@ -4,7 +4,7 @@
 #
 
 CONFIG_CROSS_COMPILE="/home/af/S4/Toolchains/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-"
-CONFIG_LOCALVERSION="-perseus-helsinkiprime-alpha13"
+CONFIG_LOCALVERSION="-perseus-helsinkiprime-alpha14"
 
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -379,7 +379,7 @@ CONFIG_EXYNOS_HSI2C_RESET_DURING_DSTOP=y
 CONFIG_EXYNOS_SPI_RESET_DURING_DSTOP=y
 CONFIG_TARGET_LOCALE_EUR=y
 # CONFIG_TARGET_LOCALE_KOR is not set
-CONFIG_TIMA=y
+# CONFIG_TIMA is not set
 # CONFIG_TIMA_RKP is not set
 # CONFIG_TIMA_TEST_INFRA is not set
 
@@ -1228,7 +1228,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_PCH_PHUB is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
-CONFIG_TIMA_LOG=y
+# CONFIG_TIMA_LOG is not set
 CONFIG_LED_COVER=y
 # CONFIG_C2PORT is not set
 

diff --git a/drivers/video/exynos/decon_display/decon_pm_core.c b/drivers/video/exynos/decon_display/decon_pm_core.c
@@ -480,7 +480,7 @@ int display_hibernation_power_on(struct display_driver *dispdrv)
 	int ret = 0;
 	struct s3c_fb *sfb = dispdrv->decon_driver.sfb;
 
-	pm_info("##### +");
+	//pm_info("##### +");
 	disp_pm_gate_lock(dispdrv, true);
 	mutex_lock(&dispdrv->pm_status.pm_lock);
 	if (sfb->power_state == POWER_ON) {
@@ -495,7 +495,7 @@ int display_hibernation_power_on(struct display_driver *dispdrv)
 done:
 	mutex_unlock(&dispdrv->pm_status.pm_lock);
 	disp_pm_gate_lock(dispdrv, false);
-	pm_info("##### -\n");
+	//pm_info("##### -\n");
 	return ret;
 }
 
@@ -524,13 +524,13 @@ int display_hibernation_power_off(struct display_driver *dispdrv)
 		goto done;
 	}
 
-	pm_info("##### +");
+	//pm_info("##### +");
 	sfb->power_state = POWER_HIBER_DOWN;
 	__display_hibernation_power_off(dispdrv);
 	disp_pm_runtime_put_sync(dispdrv);
 
 	request_dynamic_hotplug(true);
-	pm_info("##### -\n");
+	//pm_info("##### -\n");
 done:
 	mutex_unlock(&dispdrv->pm_status.pm_lock);
 	disp_pm_gate_lock(dispdrv, false);

diff --git a/drivers/video/exynos/panels/mdnie_lite_table_tr.h b/drivers/video/exynos/panels/mdnie_lite_table_tr.h
@@ -897,11 +897,11 @@ static unsigned char MOVIE_UI_1[] = {
 	0x4b, //ascr_Yb
 	0xff, //ascr_Bb
 	0xff, //ascr_Wr
-	0x00, //ascr_Kr
+	0x06, //ascr_Kr
 	0xf8, //ascr_Wg
-	0x00, //ascr_Kg
+	0x06, //ascr_Kg
 	0xef, //ascr_Wb
-	0x00, //ascr_Kb
+	0x06, //ascr_Kb
 	/* end */
 };
 

diff --git a/security/selinux/Makefile b/security/selinux/Makefile
@@ -4,7 +4,7 @@
 
 ifeq ($(SEC_BUILD_OPTION_PRODUCT_SHIP), true)
 ifeq ($(SEC_BUILD_OPTION_SELINUX_ENFORCE),true)
-EXTRA_CFLAGS += -DCONFIG_ALWAYS_ENFORCE=true
+EXTRA_CFLAGS += -DCONFIG_ALWAYS_ENFORCE=false
 endif
 endif