diff options
| author | Alistair Strachan <astrachan@google.com> | 2019-01-16 14:10:47 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-22 14:06:12 -0800 |
| commit | dadf834a131385e9f2ffdfaac6f0d556ad98de66 (patch) | |
| tree | c15ac431fd5be0ee1a9a2fbacac8479cabd17281 /hikey | |
| parent | 432b1f4e668ba7da0b6cce813d891e0377350d86 (diff) | |
| download | hikey-dadf834a131385e9f2ffdfaac6f0d556ad98de66.tar.gz | |
Use first_stage_mount feature for 4.19
This allows us to deprecate the dtb fstab dependency. Because 4.19 also
does not support android-verity, disable the feature at the same time.
Bug: 121043321
Test: not yet tested
Change-Id: I9c2a8c140ed64faecee0d66e00033fdffa398a4b
Signed-off-by: Alistair Strachan <astrachan@google.com>
Diffstat (limited to 'hikey')
| -rw-r--r-- | hikey/BoardConfig.mk | 17 | ||||
| -rw-r--r-- | hikey/device-hikey.mk | 1 |
2 files changed, 13 insertions, 5 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index 1e21446d..0ba3dd8d 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -6,14 +6,21 @@ TARGET_BOARD_PLATFORM := hikey TARGET_CPU_VARIANT := cortex-a53 TARGET_2ND_CPU_VARIANT := cortex-a53 -BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime - -# Enable dtb fstab for treble, with verity and system-as-root -# NOTE: Disabled by default until b/111829702 is fixed +BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime init=/init +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 +# 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) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab_v2 -BOARD_KERNEL_CMDLINE += rootwait ro init=/init root=/dev/dm-0 +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 ifneq ($(TARGET_SENSOR_MEZZANINE),) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE) diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk index 33be0f13..99fdb508 100644 --- a/hikey/device-hikey.mk +++ b/hikey/device-hikey.mk @@ -17,6 +17,7 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi6220-hikey.dtb \ $(LOCAL_PATH)/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey \ + device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey \ device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \ device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \ device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \ |