diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2022-08-05 19:13:49 +0800 |
|---|---|---|
| committer | Yi-yo Chiang <yochiang@google.com> | 2022-08-05 11:26:23 +0000 |
| commit | 57eedd9c739dd0d8ee050810cf525a630b5bb63e (patch) | |
| tree | f77984ff8971ae84f26579049ec689baee3ef410 | |
| parent | b98d75cb39f3a6891adfccc09478854365181b87 (diff) | |
| download | hikey-57eedd9c739dd0d8ee050810cf525a630b5bb63e.tar.gz | |
Remove stale SYSTEM_ROOT_IMAGE board config for old kernels
BOARD_BUILD_SYSTEM_ROOT_IMAGE is deprecated config which should no
longer be used.
These configs apply to kernel that's *not* 4.14 nor 4.19.
The only kernel prebuilt checked in are 4.14 and 4.19, so just remove
these.
Bug: 241355870
Test: presubmit
Change-Id: Ifae54924e2e2b6cf8fc04cb1aa6b20a619af916a
| -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 |