andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(nxp-tools): fix create_pbl print log 

Replace bl2_offset with bl2_loc, and fix byte-swapping for
Chassis2 SoC(s) only.

Signed-off-by: Biwen Li <biwen.li@nxp.com>
Signed-off-by: Jiafei Pan <Jiafei.Pan@nxp.com>
Change-Id: Ieb5fd6468178325bfb6fb89b6c31c75cd9030363
This commit is contained in:
Biwen Li 2021-01-06 13:56:58 +08:00 committed by Jiafei Pan
parent 5ba30c6c87
commit 31af441a04
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/nxp/create_pbl/create_pbl.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2021 NXP * Copyright 2021-2022 NXP
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -507,7 +507,9 @@ int add_boot_ptr_cmd(FILE *fp_rcw_pbi_op)
} }
} }
printf("\nBoot Location Pointer= %x\n", BYTE_SWAP_32(pblimg.ep)); printf("\nBoot Location Pointer= 0x%x\n",
pblimg.chassis == CHASSIS_2 ? BYTE_SWAP_32(pblimg.ep) :
pblimg.ep);
ret = SUCCESS; ret = SUCCESS;
bootptr_err: bootptr_err:

4
tools/nxp/create_pbl/pbl_ch3.mk
View File

@ -1,5 +1,5 @@
# #
# Copyright 2018-2020 NXP # Copyright 2018-2022 NXP
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -63,7 +63,7 @@ else
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET}; -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};
# Append the bl2.bin to the RCW image # Append the bl2.bin to the RCW image
@echo "bl2_loc is ${bl2_offset}" @echo "bl2_loc is ${bl2_loc} KB"
dd if=${BUILD_PLAT}/bl2.bin of=${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl bs=1K seek=${bl2_loc} dd if=${BUILD_PLAT}/bl2.bin of=${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl bs=1K seek=${bl2_loc}
cd ${CREATE_PBL_TOOL_PATH}; ${MAKE} clean ; cd -; cd ${CREATE_PBL_TOOL_PATH}; ${MAKE} clean ; cd -;