diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2016-07-28 23:02:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-28 23:02:06 +0000 |
| commit | 17a32c0af541a2fc19bbfda4a0cfe059a94aa035 (patch) | |
| tree | 46f8bb128a1c7119d7dcd57d76832db259e910fa | |
| parent | 2b4f6c2fb12437dc750bd1ee66ca90017d07f670 (diff) | |
| parent | c85a778f136d8376bf4a04d42290f3ee0cd2f82b (diff) | |
| download | hikey-17a32c0af541a2fc19bbfda4a0cfe059a94aa035.tar.gz | |
enable SELinux for hikey
am: c85a778f13
Change-Id: I6547a70af6d0cb7c056c3977fceaef5b75ea581f
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | bootloader/EFI/BOOT/grub.cfg | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 3ddabef9..c63226a8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -30,7 +30,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_HOSTAPD_DRIVER := NL80211 CONFIG_DRIVER_NL80211 := y -BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive +BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := false diff --git a/bootloader/EFI/BOOT/grub.cfg b/bootloader/EFI/BOOT/grub.cfg index 093f1be8..95c7dccb 100644 --- a/bootloader/EFI/BOOT/grub.cfg +++ b/bootloader/EFI/BOOT/grub.cfg @@ -3,35 +3,35 @@ set timeout=1 menuentry 'AOSP' { search.fs_label boot root set root=($root) - linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive + linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP-DEBUG' { search.fs_label boot root set root=($root) - linux /Image earlycon=pl011,0xf7113000 no_console_suspend=1 console=ttyFIQ0 androidboot.console=ttyFIQ0 sysrq_always_enabled androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive + linux /Image earlycon=pl011,0xf7113000 no_console_suspend=1 console=ttyFIQ0 androidboot.console=ttyFIQ0 sysrq_always_enabled androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP-CONSOLE' { search.fs_label boot root set root=($root) - linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 fiq_debugger.disable=Y androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive + linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 fiq_debugger.disable=Y androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP@720P' { search.fs_label boot root set root=($root) - linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:1280x720@60 androidboot.selinux=permissive + linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:1280x720@60 initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP@SVGA' { search.fs_label boot root set root=($root) - linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:800x600@60 androidboot.selinux=permissive + linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:800x600@60 initrd /ramdisk.img devicetree /hi6220-hikey.dtb } |