[sherlock] 10.20221207.2.109 u-boot source

GitOrigin-RevId: facb4db1e98ec021c6f2a0b14190562b082c6e17
Change-Id: Ic70369b56dca0c94ffdc7c9d4451a5ef62e461ca
Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/713690
Reviewed-by: David Pursell <dpursell@google.com>

board/amlogic/g12b_newman_bx/zircon.c

diff --git a/board/amlogic/g12b_newman_bx/zircon.c b/board/amlogic/g12b_newman_bx/zircon.c
index 6cd61b1..456135a 100644
--- a/board/amlogic/g12b_newman_bx/zircon.c
+++ b/board/amlogic/g12b_newman_bx/zircon.c
@@ -686,6 +686,7 @@
 	"client.key",
 	"hw.txt",
 	"locale_list.txt",
+	"mac_addr",
 	"nf.key",
 	"pr3.crt",
 	"pr3.key",

common/image-sparse.c

diff --git a/common/image-sparse.c b/common/image-sparse.c
index ddf5772..a2b5c0b 100644
--- a/common/image-sparse.c
+++ b/common/image-sparse.c
@@ -228,17 +228,17 @@
 			break;
 
 		case CHUNK_TYPE_DONT_CARE:
-			blk += info->reserve(info, blk, blkcnt);
-			total_blocks += chunk_header->chunk_sz;
-			break;
-
-		case CHUNK_TYPE_CRC32:
 			if (chunk_header->total_sz !=
 			    sparse_header->chunk_hdr_sz) {
 				fastboot_fail(
 					"Bogus chunk size for chunk type Dont Care");
 				return;
 			}
+			blk += info->reserve(info, blk, blkcnt);
+			total_blocks += chunk_header->chunk_sz;
+			break;
+
+		case CHUNK_TYPE_CRC32:
 			total_blocks += chunk_header->chunk_sz;
 			data += chunk_data_sz;
 			break;