2019-07-26 08:23:53 +00:00
|
|
|
From 8a458876013991fe2f288bbe4694264b16c3b9e9 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Biwen Li <biwen.li@nxp.com>
|
|
|
|
|
Date: Fri, 26 Jul 2019 15:44:10 +0800
|
2021-10-11 10:43:55 +00:00
|
|
|
Subject: [PATCH 3/3] tools/nxp: fix create_pbl and byte_swap host build
|
2019-07-26 08:23:53 +00:00
|
|
|
|
|
|
|
|
Not compile create_pbl and byte_swap in the process of cross compilation
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
|
|
|
|
---
|
2021-10-11 10:43:55 +00:00
|
|
|
tools/nxp/pbl_ch2.mk | 3 ---
|
|
|
|
|
tools/nxp/pbl_ch3.mk | 5 -----
|
2019-07-26 08:23:53 +00:00
|
|
|
2 files changed, 8 deletions(-)
|
|
|
|
|
|
2021-10-11 10:43:55 +00:00
|
|
|
--- a/tools/nxp/pbl_ch2.mk
|
|
|
|
|
+++ b/tools/nxp/pbl_ch2.mk
|
|
|
|
|
@@ -19,8 +19,6 @@ ifeq ($(RCW),"")
|
2019-07-26 08:23:53 +00:00
|
|
|
else
|
|
|
|
|
# Generate header for bl2.bin
|
|
|
|
|
$(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
|
|
|
|
|
- # Compile create_pbl tool
|
|
|
|
|
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};\
|
|
|
|
|
# Add bl2.bin to RCW
|
|
|
|
|
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
|
|
|
|
|
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;\
|
2021-10-11 10:43:55 +00:00
|
|
|
@@ -42,7 +40,6 @@ ifeq ($(RCW),"")
|
2019-07-26 08:23:53 +00:00
|
|
|
${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
|
|
|
|
|
else
|
|
|
|
|
# -a option appends the image for Chassis 3 devices in case of non secure boot
|
|
|
|
|
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};
|
|
|
|
|
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
|
|
|
|
|
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;
|
|
|
|
|
# Swapping of RCW is required for QSPi Chassis 2 devices
|
2021-10-11 10:43:55 +00:00
|
|
|
--- a/tools/nxp/pbl_ch3.mk
|
|
|
|
|
+++ b/tools/nxp/pbl_ch3.mk
|
|
|
|
|
@@ -26,9 +26,6 @@ else
|
2019-07-26 08:23:53 +00:00
|
|
|
# Generate header for bl2.bin
|
|
|
|
|
$(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
|
|
|
|
|
|
|
|
|
|
- # Compile create_pbl tool
|
|
|
|
|
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};\
|
|
|
|
|
-
|
|
|
|
|
# Add Block Copy command for bl2.bin to RCW
|
|
|
|
|
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
|
|
|
|
|
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};\
|
2021-10-11 10:43:55 +00:00
|
|
|
@@ -56,8 +53,6 @@ else #SECURE_BOOT
|
2019-07-26 08:23:53 +00:00
|
|
|
ifeq ($(RCW),"")
|
|
|
|
|
${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
|
|
|
|
|
else
|
|
|
|
|
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};
|
|
|
|
|
-
|
|
|
|
|
# Add Block Copy command and populate boot loc ptrfor bl2.bin to RCW
|
|
|
|
|
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
|
|
|
|
|
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};
|
