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/util/cbfstool/ifittool.c
+++ b/util/cbfstool/ifittool.c
@@ -356,11 +356,11 @@ int main(int argc, char *argv[])
 				return 1;
 			}

-			len = ntohl(cbfs_file->len);
+			len = be32toh(cbfs_file->len);
 			offset = offset_to_ptr(convert_to_from_top_aligned,
 					&image.buffer,
 					cbfs_get_entry_addr(&image, cbfs_file) +
-					ntohl(cbfs_file->offset));
+					be32toh(cbfs_file->offset));


 			if (fit_add_entry(fit, offset, len, fit_type,
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])

 		fit_address = offset_to_ptr(convert_to_from_top_aligned, &image.buffer,
 				       cbfs_get_entry_addr(&image, cbfs_file)
-					       + ntohl(cbfs_file->offset));
+					       + be32toh(cbfs_file->offset));


 		if (set_fit_pointer(&bootblock, fit_address, convert_to_from_top_aligned,