summaryrefslogtreecommitdiff
path: root/hikey
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2018-12-17 16:27:02 -0800
committerAlistair Strachan <astrachan@google.com>2019-01-14 11:11:08 -0800
commite0bf197ee97b29af2ff5bb0396d65914776f2671 (patch)
tree479026d7d766287d296ce79ed5118575e00e8e1e /hikey
parent770814998fa311785e055044e015dd4a4ef3f1b5 (diff)
downloadhikey-e0bf197ee97b29af2ff5bb0396d65914776f2671.tar.gz
hikey: Enable verity/system-as-root by default
Enable verity/system-as-root by default. NOTE: This requires prebuilt kernel binaries to be updated before this lands. Change-Id: Ideb54cd6b21cdf2e5bb5be9bd70bd02bae08d314 Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'hikey')
-rw-r--r--hikey/BoardConfig.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 13eed48f..1eab567c 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -13,17 +13,12 @@ else
BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
endif
-ifneq ($(TARGET_ANDROID_VERITY),)
# Enable dtb fstab for treble, with verity and system-as-root
# NOTE: Disabled by default until b/111829702 is fixed
BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab_v2
BOARD_KERNEL_CMDLINE += rootwait ro init=/init root=/dev/dm-0
BOARD_KERNEL_CMDLINE += dm=\"system none ro,0 1 android-verity 179:9\"
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-else
-# Enable dtb fstab for treble
-BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab
-endif
ifneq ($(TARGET_SENSOR_MEZZANINE),)
BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE)