hikey960: BoardConfig.mk: Remove legacy dtb fstab logic
The dtb fstab logic is no longer supported, and was
getting triggered only with 4.14 kernels which caused
problems trying to boot with the virt-a/b config we've
used for awhile.
So drop this logic entirely to clean things up.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Id9f9dfc58225cfbad9ef666b8e917feed5325292
diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index 515cce6..f7deb4c 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -16,24 +16,6 @@
BOARD_KERNEL_CMDLINE += drm_kms_helper.edid_firmware=edid/1920x1080.bin
endif
-# On kernels before 4.19, enable dtb fstab. On kernels >= 4.19, 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)
-# Enable treble dtb fstab with verity
-ifneq ($(TARGET_ANDROID_VERITY),)
-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 8:58\"
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-else
-# Enable treble dtb fstab without verity
-BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab
-endif
-endif
-
ifneq ($(TARGET_SENSOR_MEZZANINE),)
BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE)
endif