summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Pacholec <artur.pacholec@sonymobile.com>2014-08-08 12:14:32 +0100
committerArtur Pacholec <artur.pacholec@sonymobile.com>2014-09-12 12:00:46 +0000
commit6b647509297df106d4865f965781b57bded59b3a (patch)
treebfd49a2461289a25c3d3242fd31d942c50288922
parent158a993221acd248083ae78428d0bbe6d69c02c6 (diff)
downloadbcm-6b647509297df106d4865f965781b57bded59b3a.tar.gz
Set SELinux to Enforcing
Change-Id: I9f9374c1ade12ebcc7b5e4b0d92fdc1a57bfc787
-rw-r--r--arch/arm/boot/dts/java_sony_brooks_020.dts2
-rw-r--r--arch/arm/configs/tetra_defconfig5
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/java_sony_brooks_020.dts b/arch/arm/boot/dts/java_sony_brooks_020.dts
index bcda96d02f2..209e31b7111 100644
--- a/arch/arm/boot/dts/java_sony_brooks_020.dts
+++ b/arch/arm/boot/dts/java_sony_brooks_020.dts
@@ -10,7 +10,7 @@
compatible = "bcm,java";
chosen {
- bootargs = "console=ttyS0,115200n8 mem=448M@0x81E00000 mem=16M@0x9F000000 gpt androidboot.console=ttyS0 quiet crash_ramdump=1 logbuf_nocache=1 vmalloc=136M androidboot.hardware=tetra";
+ bootargs = "console=ttyS0,115200n8 mem=448M@0x81E00000 mem=16M@0x9F000000 gpt androidboot.console=ttyS0 quiet crash_ramdump=1 logbuf_nocache=1 vmalloc=136M androidboot.hardware=tetra androidboot.selinux=enforcing";
};
memory@81e00000{
diff --git a/arch/arm/configs/tetra_defconfig b/arch/arm/configs/tetra_defconfig
index a01717b62ba..90932fcffda 100644
--- a/arch/arm/configs/tetra_defconfig
+++ b/arch/arm/configs/tetra_defconfig
@@ -2,6 +2,7 @@
CONFIG_PHYS_OFFSET=0x81E00000
# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set
+CONFIG_AUDIT=y
CONFIG_SYSVIPC=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -520,6 +521,10 @@ CONFIG_DYNAMIC_DEBUG=y
CONFIG_SDHCI_THROUGHPUT=y
CONFIG_BRCM_DEBUG_RWSEM=y
CONFIG_DEBUG_USER=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_TWOFISH=y