diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-17 20:14:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-17 20:14:27 +0000 |
commit | 1438b568a6b6d9dc431974dff62520afd881fb89 (patch) | |
tree | 4db70083a174c3188cbdad03ea672afb822e0ada | |
parent | 3c3601c3ea4e06b5f721ac764e10125c13bd6375 (diff) | |
parent | 5152e5079df62bc9620d73b1e0dede4940b5c251 (diff) | |
download | hikey-1438b568a6b6d9dc431974dff62520afd881fb89.tar.gz |
Merge "hikey/hikey960: Set verifiedbootstate property" into main am: 81dda7b637 am: 9627cfa3a5 am: 5152e5079d
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2792492
Change-Id: Id83f3fd04dcea83897efcc32015427ceee8d9827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | hikey/BoardConfig.mk | 1 | ||||
-rw-r--r-- | hikey960/BoardConfig.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index 7c31ac76..5f03ddb2 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -9,6 +9,7 @@ TARGET_2ND_CPU_VARIANT := cortex-a53 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 +BOARD_KERNEL_CMDLINE += androidboot.verifiedbootstate=orange ifneq ($(TARGET_SENSOR_MEZZANINE),) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE) diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk index 71a6273f..32f2992a 100644 --- a/hikey960/BoardConfig.mk +++ b/hikey960/BoardConfig.mk @@ -11,6 +11,7 @@ TARGET_NO_DTIMAGE := false BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 firmware_class.path=/vendor/firmware efi=noruntime init=/init BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/ff3b0000.ufs BOARD_KERNEL_CMDLINE += loglevel=15 androidboot.slot_suffix=_a +BOARD_KERNEL_CMDLINE += androidboot.verifiedbootstate=orange ifeq ($(HIKEY960_ENABLE_AVF), true) # The GKI kernel set protected mode by default via gki_defconfig, |