X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=inline;f=tools%2Fpblimage.c;h=3c823e96cf17d127de25a0c42f18fed5a712eadc;hb=55a98d96bd740ecff5d26a0253eed1d5341c614e;hp=ffc3268209d2b3d0542d5f29f69fefc5251cee0e;hpb=3b19c1dbe0464d1cdf3b3006042cc75bc439321f;p=oweals%2Fu-boot.git

diff --git a/tools/pblimage.c b/tools/pblimage.c
index ffc3268209..3c823e96cf 100644
--- a/tools/pblimage.c
+++ b/tools/pblimage.c
@@ -1,12 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include "imagetool.h"
 #include <image.h>
 #include "pblimage.h"
 #include "pbl_crc32.h"
+#include <u-boot/crc.h>
 
 #define roundup(x, y)		((((x) + ((y) - 1)) / (y)) * (y))
 #define PBL_ACS_CONT_CMD	0x81000000
@@ -293,7 +293,7 @@ int pblimage_check_params(struct image_tool_params *params)
 		pbi_crc_cmd2 = 0;
 		pbl_cmd_initaddr = params->addr & PBL_ADDR_24BIT_MASK;
 		pbl_cmd_initaddr |= PBL_ACS_CONT_CMD;
-		pbl_cmd_initaddr |= uboot_size;
+		pbl_cmd_initaddr += uboot_size;
 		pbl_end_cmd[0] = 0x09610000;
 		pbl_end_cmd[1] = 0x00000000;
 		pbl_end_cmd[2] = 0x096100c0;