package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch

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