diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-08 16:44:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-08 16:44:17 +0000 |
| commit | 59d1eb18e39efdddb5249be4bb17bd96b5cbc845 (patch) | |
| tree | 6bdcc02fcd93ef6abde7fa39ef828a769495975f | |
| parent | f3866eeaa65cdd55184a9bc558fe6c9f23190c72 (diff) | |
| parent | 57eedd9c739dd0d8ee050810cf525a630b5bb63e (diff) | |
| download | hikey-59d1eb18e39efdddb5249be4bb17bd96b5cbc845.tar.gz | |
Merge "Remove stale SYSTEM_ROOT_IMAGE board config for old kernels"
| -rw-r--r-- | hikey/BoardConfig.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index b30c3287..7c31ac76 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -10,20 +10,6 @@ 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.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) endif |