diff options
| author | John Stultz <john.stultz@linaro.org> | 2019-04-25 16:06:53 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2019-04-25 16:08:31 -0700 |
| commit | 6218335f76c8aec8e7025ed084f0a4fa4ab1b9b4 (patch) | |
| tree | 70f6dc598eec579b2086f5f5eca4d12860da0269 | |
| parent | b5fc0cb2f36be563bb69959d7e181a5552c02385 (diff) | |
| download | hikey-oreo-mr1-iot-release.tar.gz | |
hikey: Turn off verity/dm for 4.14 as wellandroid-o-mr1-iot-release-1.0.12oreo-mr1-iot-release
With verity and the dm= initialization being disabled
in common/andorid-4.14, turn off these features
in userland as well.
Long term we need to get dynamic partitions up and
running, but this works as a short term fix.
Change-Id: I8e55c13fa5a675db2c8044adb101d7bae02d6318
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -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) |