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] plat/nxp/tools: 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  plat/nxp/tools/pbl_ch2.mk | 3 ---
  11  plat/nxp/tools/pbl_ch3.mk | 5 -----
  12  2 files changed, 8 deletions(-)
  13
  14 diff --git a/plat/nxp/tools/pbl_ch2.mk b/plat/nxp/tools/pbl_ch2.mk
  15 index afa43520..ff624dd9 100644
  16 --- a/plat/nxp/tools/pbl_ch2.mk
  17 +++ b/plat/nxp/tools/pbl_ch2.mk
  18 @@ -20,8 +20,6 @@ ifeq ($(RCW),"")
  19  else
  20         # Generate header for bl2.bin
  21         $(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
  22 -       # Compile create_pbl tool
  23 -       ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};\
  24         # Add bl2.bin to RCW
  25         ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
  26                         -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;\
  27 @@ -43,7 +41,6 @@ ifeq ($(RCW),"")
  28         ${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
  29  else
  30         # -a option appends the image for Chassis 3 devices in case of non secure boot
  31 -       ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};
  32         ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
  33         -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;
  34  # Swapping of RCW is required for QSPi Chassis 2 devices
  35 diff --git a/plat/nxp/tools/pbl_ch3.mk b/plat/nxp/tools/pbl_ch3.mk
  36 index 944ae3bb..9aa8f635 100644
  37 --- a/plat/nxp/tools/pbl_ch3.mk
  38 +++ b/plat/nxp/tools/pbl_ch3.mk
  39 @@ -27,9 +27,6 @@ else
  40         # Generate header for bl2.bin
  41         $(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
  42
  43 -       # Compile create_pbl tool
  44 -       ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};\
  45 -
  46         # Add Block Copy command for bl2.bin to RCW
  47         ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
  48                         -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};\
  49 @@ -57,8 +54,6 @@ else  #SECURE_BOOT
  50  ifeq ($(RCW),"")
  51         ${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
  52  else
  53 -       ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};
  54 -
  55         # Add Block Copy command and populate boot loc ptrfor bl2.bin to RCW
  56         ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
  57         -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};
  58 --
  59 2.17.1
  60