diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-11-17 19:40:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-17 19:40:04 +0000 |
| commit | 02670e4227b082da22ed320c5cfecb0a3f8b101c (patch) | |
| tree | 1e4ffa206495461689b3c25260242699e6db5df6 | |
| parent | c2636f35d48194d3c63c0c9dca25f037a79f4cfe (diff) | |
| parent | 1462b8ed09ad74a50a263851af02fa08c0461552 (diff) | |
| download | marvell-02670e4227b082da22ed320c5cfecb0a3f8b101c.tar.gz | |
Merge "Add explicit SELinux kernel cmdline." into mnc-brillo-dev
| -rw-r--r-- | soc/iap140/soc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soc/iap140/soc.mk b/soc/iap140/soc.mk index bbc5696..9202313 100644 --- a/soc/iap140/soc.mk +++ b/soc/iap140/soc.mk @@ -26,7 +26,7 @@ TARGET_KERNEL_ARCH := $(TARGET_ARCH) TARGET_NO_BOOTLOADER := false TARGET_NO_KERNEL := false -BOARD_KERNEL_CMDLINE := androidboot.console=ttyS1 console=ttyS1,115200 panic_debug uart_dma crashkernel=4k@0x8140000 user_debug=31 earlyprintk=uart8250-32bit,0xd4017000 cma=20M ddr_mode=2 RDCA=08140400 cpmem=32M@0x06000000 androidboot.exist.cp=18 androidboot.hardware=iap140 +BOARD_KERNEL_CMDLINE := androidboot.console=ttyS1 console=ttyS1,115200 panic_debug uart_dma crashkernel=4k@0x8140000 user_debug=31 earlyprintk=uart8250-32bit,0xd4017000 cma=20M ddr_mode=2 RDCA=08140400 cpmem=32M@0x06000000 androidboot.exist.cp=18 androidboot.hardware=iap140 androidboot.selinux=enforcing PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init.iap140.rc:root/init.iap140.rc \ @@ -41,5 +41,5 @@ BOARD_SEPOLICY_DIRS += \ TARGET_KERNEL_SRC := hardware/bsp/kernel/marvell/pxa-3.14 TARGET_KERNEL_DEFCONFIG := armadillo_edge_defconfig -# include the hal modules +# Include the HAL modules. -include hardware/bsp/marvell/soc/iap140/hal_modules.mk |