commit 29e6b8138bf1a863b7f78d3a6b7a2eef5e3643c1
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 19 21:19:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 19 21:19:27 2020 +0000
tree fefe29662a31bfb37f8c87c40e0aa28c21b73a8f
parent 468fa60eebe5e2124f9cc20b636a9179080d320a
parent 7e64ea31a503a71bc9bc8107ddc089a839265a92

Merge "db845c: Add fw_devlink=permissive to the boot arguments" am: 7e64ea31a5

Change-Id: Ibdd76e752196cb42ab9b2154cce1f71ffc95fb6d

db845c/BoardConfig.mk

diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk
index 816c465..20ca782 100644
--- a/db845c/BoardConfig.mk
+++ b/db845c/BoardConfig.mk
@@ -13,6 +13,9 @@
 BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c
 BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc@0/1d84000.ufshc printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30
+# fw_devlink=on, https://android-review.googlesource.com/c/1305327, broke android-mainline
+# Set fw_devlink=permissive for the time being
+BOARD_KERNEL_CMDLINE += fw_devlink=permissive
 
 # Image Configuration
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M