[RAMEN9610-13993] arm64: dts: change selinux mode param location

Change-Id: I5e1239079afd6bb8914928dcb178cb6a3b21e7c2
Signed-off-by: Munjoo Kim <munjoo.kim@samsung.com>

diff --git a/arch/arm64/boot/dts/exynos/exynos9610.dtsi b/arch/arm64/boot/dts/exynos/exynos9610.dtsi
index 0382b599827f886d91137c4c3fa5ce5214a673e4..6c69e8265ef2ce79e0a06ae9bb18bccdd5b22c5c 100644 (file)
--- 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 bd5f6df9988e4836e37ea7e4cb4e112020316b4d..07fdaf8d3e344626aac82ed1872621d7a6e4c6ee 100644 (file)
--- 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