From: Munjoo Kim Date: Fri, 29 Mar 2019 01:00:46 +0000 (+0900) Subject: [RAMEN9610-13993] arm64: dts: change selinux mode param location X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5736e293d5274f8c1f0e81330fe18325206bad66;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [RAMEN9610-13993] arm64: dts: change selinux mode param location Change-Id: I5e1239079afd6bb8914928dcb178cb6a3b21e7c2 Signed-off-by: Munjoo Kim --- diff --git a/arch/arm64/boot/dts/exynos/exynos9610.dtsi b/arch/arm64/boot/dts/exynos/exynos9610.dtsi index 0382b599827f..6c69e8265ef2 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610.dtsi @@ -118,7 +118,7 @@ }; chosen { - bootargs = "swiotlb=512 console=ram androidboot.dtbo_idx=0 skip_initramfs rootwait ro init=/init clk_ignore_unused bcm_setup=0xffffff90f8e00000 androidboot.hardware=exynos9610 androidboot.selinux=permissive androidboot.debug_level=0x4948 firmware_class.path=/vendor/firmware ecd_setup=disable reserve-fimc=0xffffff90f9fe0000 pmic_info=0x3 ccic_info=0x1 epx_activate=true"; + bootargs = "swiotlb=512 console=ram androidboot.dtbo_idx=0 skip_initramfs rootwait ro init=/init clk_ignore_unused bcm_setup=0xffffff90f8e00000 androidboot.hardware=exynos9610 androidboot.debug_level=0x4948 firmware_class.path=/vendor/firmware ecd_setup=disable reserve-fimc=0xffffff90f9fe0000 pmic_info=0x3 ccic_info=0x1 epx_activate=true"; linux,initrd-start = <0x84000000>; linux,initrd-end = <0x841FFFFF>; }; diff --git a/arch/arm64/configs/erd9610_defconfig b/arch/arm64/configs/erd9610_defconfig index bd5f6df9988e..07fdaf8d3e34 100644 --- a/arch/arm64/configs/erd9610_defconfig +++ b/arch/arm64/configs/erd9610_defconfig @@ -603,3 +603,5 @@ CONFIG_SENSORS_NTC_THERMISTOR=y CONFIG_BACKLIGHT_SGM37603=y CONFIG_BACKLIGHT_LM36923=y CONFIG_SCSC_WLAN_ENABLE_MAC_RANDOMISATION=y +CONFIG_CMDLINE="androidboot.selinux=permissive" +CONFIG_CMDLINE_EXTEND=y