From cbaccefdbe962917334b0924e1f88d6e4f873832 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 29 Apr 2021 16:43:48 -0700 Subject: psm/plm/pmu/fsbl: Exclude TOPDIR from hash Issue: CR-1096936 TOPDIR is only used to find the file to copy in the case of a multiconfig build. However, even in this case the value of TOPDIR does not effect the resulting build. Exclude this variable to avoid unnecessary rebuilds of firmware in the eSDK. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/include/soc-versal.inc | 2 ++ meta-xilinx-bsp/conf/machine/include/soc-zynq.inc | 1 + meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc | 2 ++ 3 files changed, 5 insertions(+) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc index 05a52c1d..403b3264 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc @@ -23,9 +23,11 @@ UBOOT_ELF ?= "u-boot.elf" PLM_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '', 'plm-firmware:do_deploy', d)}" PLM_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'mc::versal-fw:plm-firmware:do_deploy', '', d)}" PLM_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}" +PLM_DEPLOY_DIR[vardepsexclude] += "TOPDIR" PLM_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'plm-versal-mb', 'plm-${MACHINE}', d)}" PSM_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '', 'psm-firmware:do_deploy', d)}" PSM_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'mc::versal-fw:psm-firmware:do_deploy', '', d)}" PSM_FIRMWARE_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}" +PSM_DEPLOY_DIR[vardepsexclude] += "TOPDIR" PSM_FIRMWARE_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'psm-firmware-versal-mb', 'psm-firmware-${MACHINE}', d)}" diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc index 0ceeeee8..4284cff8 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc @@ -28,4 +28,5 @@ UBOOT_ELF ?= "u-boot.elf" FSBL_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '', 'fsbl-firmware:do_deploy', d)}" FSBL_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'mc::fsbl-fw:fsbl-firmware:do_deploy', '', d)}" FSBL_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}" +FSBL_DEPLOY_DIR[vardepsexclude] += "TOPDIR" FSBL_IMAGE_NAME ?= "fsbl-${MACHINE}" diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc index ee2a14ae..31070822 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc @@ -35,6 +35,7 @@ PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf" PMU_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', '', 'pmu-firmware:do_deploy', d)}" PMU_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'mc::zynqmp-pmufw:pmu-firmware:do_deploy', '', d)}" PMU_FIRMWARE_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', '${TOPDIR}/tmp-microblaze-zynqmp-pmufw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}" +PMU_FIRMWARE_DEPLOY_DIR[vardepsexclude] += "TOPDIR" PMU_FIRMWARE_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'pmu-firmware-zynqmp-pmu', 'pmu-firmware-${MACHINE}', d)}" # Default, if multiconfig is off, the fsbl is in the regular deploydir, otherwise @@ -42,4 +43,5 @@ PMU_FIRMWARE_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw' FSBL_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '', 'fsbl-firmware:do_deploy', d)}" FSBL_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'mc::fsbl-fw:fsbl-firmware:do_deploy', '', d)}" FSBL_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}" +FSBL_DEPLOY_DIR[vardepsexclude] += "TOPDIR" FSBL_IMAGE_NAME ?= "fsbl-${MACHINE}" -- cgit v1.2.3-54-g00ecf