Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions
--- a/payloads/libpayload/bin/lp.functions
+++ b/payloads/libpayload/bin/lp.functions
@@ -63,3 +63,9 @@ if [ -d $BASE/../include ]; then
 else
 	_INCDIR=$LIBPAYLOAD_PREFIX/include
 fi
+
+if [ -d $BASE/../vboot ]; then
+	_VBOOTINCDIR=$BASE/../vboot/include
+else
+	_VBOOTINCDIR=$LIBPAYLOAD_PREFIX/../vboot/include
+fi