diff options
| author | Biwen Li <biwen.li@nxp.com> | 2021-01-06 13:56:58 +0800 |
|---|---|---|
| committer | Jiafei Pan <Jiafei.Pan@nxp.com> | 2022-03-27 23:24:24 +0800 |
| commit | 31af441a0445d4a5e88ddcc371c51b3701c25839 (patch) | |
| tree | 1a5e828f4c942e9a493e815c806f7aeda8647691 /tools | |
| parent | 5ba30c6c87451caafdb9918a658a6f4a307aa0ca (diff) | |
| download | arm-trusted-firmware-31af441a0445d4a5e88ddcc371c51b3701c25839.tar.gz | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/nxp/create_pbl/create_pbl.c | 6 | ||||
| -rw-r--r-- | tools/nxp/create_pbl/pbl_ch3.mk | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/nxp/create_pbl/create_pbl.c b/tools/nxp/create_pbl/create_pbl.c index 244b0fbd8..9457a00b1 100644 --- a/tools/nxp/create_pbl/create_pbl.c +++ b/tools/nxp/create_pbl/create_pbl.c @@ -1,5 +1,5 @@ /* - * Copyright 2021 NXP + * Copyright 2021-2022 NXP * * 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; bootptr_err: diff --git a/tools/nxp/create_pbl/pbl_ch3.mk b/tools/nxp/create_pbl/pbl_ch3.mk index e9dbfb029..928347415 100644 --- a/tools/nxp/create_pbl/pbl_ch3.mk +++ b/tools/nxp/create_pbl/pbl_ch3.mk @@ -1,5 +1,5 @@ # -# Copyright 2018-2020 NXP +# Copyright 2018-2022 NXP # # SPDX-License-Identifier: BSD-3-Clause # @@ -63,7 +63,7 @@ else -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET}; # 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} cd ${CREATE_PBL_TOOL_PATH}; ${MAKE} clean ; cd -; |