From: York Sun <york.sun@nxp.com>
Date: Tue, 15 Aug 2017 18:14:41 +0000 (-0700)
Subject: tools: pblimage: Fix address calculation
X-Git-Tag: v2017.11-rc1~165^2~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05e35d26dbd18bbe896d361be7929749812059c8;p=oweals%2Fu-boot.git

tools: pblimage: Fix address calculation

The image size should be added to the initial pbl command, not bit
"ORed".

Signed-off-by: York Sun <york.sun@nxp.com>
---

diff --git a/tools/pblimage.c b/tools/pblimage.c
index ffc3268209..d25a733d41 100644
--- a/tools/pblimage.c
+++ b/tools/pblimage.c
@@ -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;