diff options
| author | John Stultz <john.stultz@linaro.org> | 2019-04-26 11:54:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-26 11:54:20 -0700 |
| commit | 5aacb8f0265951f148a943f8b0359251b558c7dd (patch) | |
| tree | 70f6dc598eec579b2086f5f5eca4d12860da0269 | |
| parent | 3455f409f150ec903ec793616c63ee4b8b125222 (diff) | |
| parent | 6218335f76c8aec8e7025ed084f0a4fa4ab1b9b4 (diff) | |
| download | hikey-5aacb8f0265951f148a943f8b0359251b558c7dd.tar.gz | |
hikey: Turn off verity/dm for 4.14 as well
am: 6218335f76
Change-Id: Ib04f64f903e37eea8397ab930d0e8d765696a02e
| -rw-r--r-- | hikey/BoardConfig.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index 0ba3dd8d..0660a8e4 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -10,17 +10,19 @@ BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey firmware_class.path=/vendor/f BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/f723d000.dwmmc0 BOARD_KERNEL_CMDLINE += console=ttyAMA3,115200 androidboot.console=ttyAMA3 -# On kernels before 4.19, enable dtb fstab with android-verity. On kernels >= -# 4.19, both dtb fstab and android-verity are deprecated, so until we have +# On kernels before 4.14, enable dtb fstab with android-verity. On kernels >= +# 4.14, both dtb fstab and android-verity are deprecated, so until we have # avb2 support in the bootloader, don't enable either feature. The ramdisk # fstab needed for the new mechanism will be installed unconditionally; if # dtb fstab is present, it will override it automatically. ifneq ($(TARGET_KERNEL_USE),4.19) +ifneq ($(TARGET_KERNEL_USE),4.14) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab_v2 BOARD_KERNEL_CMDLINE += rootwait ro root=/dev/dm-0 BOARD_KERNEL_CMDLINE += dm=\"system none ro,0 1 android-verity 179:9\" BOARD_BUILD_SYSTEM_ROOT_IMAGE := true endif +endif ifneq ($(TARGET_SENSOR_MEZZANINE),) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE) |