]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
tools: pblimage: Fix address calculation
authorYork Sun <york.sun@nxp.com>
Tue, 15 Aug 2017 18:14:41 +0000 (11:14 -0700)
committerYork Sun <york.sun@nxp.com>
Mon, 11 Sep 2017 14:55:36 +0000 (07:55 -0700)
The image size should be added to the initial pbl command, not bit
"ORed".

Signed-off-by: York Sun <york.sun@nxp.com>
tools/pblimage.c

index ffc3268209d2b3d0542d5f29f69fefc5251cee0e..d25a733d4147f76396ca7fc088e5403c034f8214 100644 (file)
@@ -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;