commit bee27286738a6b1eea22c2f7d04f50e86d478076
author Mark Salyzyn <salyzyn@google.com> Wed Jul 08 03:54:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 03:54:30 2020 +0000
tree 1331666a5fb723c9ea5ccbfe0b67517158c7ead6
parent 540c9ade686178b677db83ce7ae74f3553acdd54
parent 42096b12d871ebd740b84ea07ac3d7b9bbc2f063

Merge "Revert "db845c: Add fw_devlink=permissive to the boot arguments"" am: 33f08860f4 am: 42096b12d8

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1356366

Change-Id: I466f2bf4e76e3e373eacb31f1ea5eb3dd2da8948

db845c/BoardConfig.mk

diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk
index 20ca782..816c465 100644
--- a/db845c/BoardConfig.mk
+++ b/db845c/BoardConfig.mk
@@ -13,9 +13,6 @@
 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