meta-xilinx-setup: Add BASE_TMPDIR

A new variable BASE_TMPDIR was defined to make it easier for a user to choose
an alternative directory for the various TMPDIR files.  Since there are
references from one TMPDIR to another, we need a simply way to adjust them
all as a unit.

A developer should NOT change the actual TMPDIR specifications, unless they
also change all of the other generated configurations!

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 25 insertions, 19 deletions

diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
index 41a6c0c8..894f08c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
@@ -46,18 +46,20 @@ however you may use any path you wish.
 
 To enable this, add the following to your local.conf:
 
+# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere
+BASE_TMPDIR = "${TOPDIR}"
 require conf/cortexa53-zynqmp-linux.conf
 SYSTEM_DTFILE = "/proj/yocto/zu_sdt/system-top.dts"
 BBMULTICONFIG += " cortexa53-zynqmp-fsbl-baremetal cortexa53-zynqmp-baremetal cortexa53-zynqmp-freertos cortexr5-zynqmp-fsbl-baremetal cortexr5-zynqmp-baremetal cortexr5-zynqmp-freertos microblaze-pmu"
 FSBL_DEPENDS = ""
 FSBL_MCDEPENDS = "mc::cortexa53-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
-FSBL_DEPLOY_DIR = "${TOPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
 R5FSBL_DEPENDS = ""
 R5FSBL_MCDEPENDS = "mc::cortexr5-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
-R5FSBL_DEPLOY_DIR = "${TOPDIR}/tmp-cortexr5-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
 PMU_DEPENDS = ""
 PMU_MCDEPENDS = "mc::microblaze-pmu:pmu-firmware:do_deploy"
-PMU_FIRMWARE_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}"
+PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}"
 
 #
 # OR
@@ -70,15 +72,17 @@ PMU_FIRMWARE_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}
 
 To enable this, add the following to your local.conf:
 
+# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere
+BASE_TMPDIR = "${TOPDIR}"
 require conf/cortexa72-versal-linux.conf
 SYSTEM_DTFILE = "/proj/yocto/mhatle/DTB-FLOW/testing/vck190-sdt/system-top.dts"
 BBMULTICONFIG += " cortexa72-versal-baremetal cortexa72-versal-freertos microblaze-pmc microblaze-psm cortexr5-versal-baremetal cortexr5-versal-freertos"
 PLM_DEPENDS = ""
 PLM_MCDEPENDS = "mc::microblaze-pmc:plm-firmware:do_deploy"
-PLM_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}"
+PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}"
 PSM_DEPENDS = ""
 PSM_MCDEPENDS = "mc::microblaze-psm:psm-firmware:do_deploy"
-PSM_FIRMWARE_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}"
+PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}"
 PDI_PATH = "__PATH TO PDI FILE HERE__"
 
 # NOTE: On versal, you MUST specify the PDI file as directed by the instructions.
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
index 8a313dd8..917ce91f 100755
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
@@ -137,7 +137,7 @@ cortex_a53_baremetal() {
   fi
   if [ $1 = "fsbl" ]; then
     fsbl_mcdepends="mc::${dtb_file%%.dtb}:fsbl-firmware:do_deploy"
-    fsbl_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+    fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
   fi
 
   # Build device tree
@@ -154,7 +154,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa53-${machine}"
 DEFAULTTUNE = "cortexa53"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "$yocto_distro"
 
@@ -192,7 +192,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa53-${machine}"
 DEFAULTTUNE = "cortexa53"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-freertos"
 
@@ -272,7 +272,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa72-${machine}"
 DEFAULTTUNE = "cortexa72"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone-nolto"
 
@@ -310,7 +310,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa72-${machine}"
 DEFAULTTUNE = "cortexa72"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-freertos"
 
@@ -346,7 +346,7 @@ cortex_r5_baremetal() {
 
   if [ $1 = "fsbl" ]; then
     r5fsbl_mcdepends="mc::${dtb_file%%.dtb}:fsbl-firmware:do_deploy"
-    r5fsbl_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+    r5fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
   fi
   # Build device tree
   mkdir -p dtb
@@ -362,7 +362,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexr5-${machine}"
 DEFAULTTUNE = "cortexr5f"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "$yocto_distro"
 
@@ -400,7 +400,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexr5-${machine}"
 DEFAULTTUNE = "cortexr5f"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-freertos"
 
@@ -433,7 +433,7 @@ pmu-microblaze() {
   distro="multiconfig/includes/microblaze-pmu-distro.conf"
 
   pmu_mcdepends="mc::${dtb_file%%.dtb}:pmu-firmware:do_deploy"
-  pmu_firmware_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  pmu_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
 
   # Build device tree
   mkdir -p dtb
@@ -454,7 +454,7 @@ TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES_tune-pmu-microbl
 
 TARGET_CFLAGS += "-DPSU_PMU=1U"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone"
 
@@ -472,7 +472,7 @@ pmc-microblaze() {
   distro="multiconfig/includes/microblaze-pmc-distro.conf"
 
   plm_mcdepends="mc::${dtb_file%%.dtb}:plm-firmware:do_deploy"
-  plm_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  plm_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
 
   # Build device tree
   mkdir -p dtb
@@ -493,7 +493,7 @@ TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES_tune-pmc-microbl
 
 TARGET_CFLAGS += "-DVERSAL_PLM=1"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone"
 
@@ -511,7 +511,7 @@ psm-microblaze() {
   distro="multiconfig/includes/microblaze-psm-distro.conf"
 
   psm_mcdepends="mc::${dtb_file%%.dtb}:psm-firmware:do_deploy"
-  psm_firmware_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  psm_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
 
   # Build device tree
   mkdir -p dtb
@@ -532,7 +532,7 @@ TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES_tune-psm-microbl
 
 TARGET_CFLAGS += "-DVERSAL_psm=1"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone"
 
@@ -707,6 +707,8 @@ rm cpu-list.tmp
 
 echo "To enable this, add the following to your local.conf:"
 echo
+echo '# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere'
+echo 'BASE_TMPDIR = "${TOPDIR}"'
 if [ -n "${system_conf}" ]; then
   echo "require ${system_conf}"
 fi