003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch 2.6 KB

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