diff mbox

[U-Boot,v3,1/5] tools: pblimage: Fix address calculation

Message ID 1502820885-10346-2-git-send-email-york.sun@nxp.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

York Sun Aug. 15, 2017, 6:14 p.m. UTC 
The image size should be added to the initial pbl command, not bit
"ORed".

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

Changes in v3: None
Changes in v2: None

 tools/pblimage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

York Sun Sept. 13, 2017, 2:20 a.m. UTC | #1 
On 08/15/2017 11:15 AM, York Sun wrote:
> The image size should be added to the initial pbl command, not bit
> "ORed".
> 
> Signed-off-by: York Sun <york.sun@nxp.com>
> ---
> 
> Changes in v3: None
> Changes in v2: None
> 

Applied to fsl-qoriq master.

York
diff mbox

Patch

diff --git a/tools/pblimage.c b/tools/pblimage.c
index ffc3268..d25a733 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;