From 4882f3643717df44af864f6d2133e90f524923c0 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Wed, 16 Sep 2020 09:38:10 -0700 Subject: zcu102-zynqmp.conf: Update PMU_FIRMWARE_DEPLOY_DIR paths to look under microblaze-pmu zynqmp-pmu is renamed to microblaze-pmu. Update the PMU_FIRMWARE_DEPLOY_DIR path to look under correct path. Set weakest assignment in local.conf.sample for the above variables. Signed-off-by: Sai Hari Chandana Kalluri --- meta-xilinx-bsp/conf/local.conf.sample | 4 ++-- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-bsp/conf/local.conf.sample b/meta-xilinx-bsp/conf/local.conf.sample index 5d567afc..f10cd389 100644 --- a/meta-xilinx-bsp/conf/local.conf.sample +++ b/meta-xilinx-bsp/conf/local.conf.sample @@ -223,8 +223,8 @@ XILINX_VER_MAIN = "2020.1" # RM_WORK_EXCLUDE += "u-boot-xlnx-dev" #Add below lines to use runqemu for ZU+ machines -PMU_FIRMWARE_DEPLOY_DIR = "${DEPLOY_DIR_IMAGE}" -PMU_FIRMWARE_IMAGE_NAME = "pmu-firmware-${MACHINE}" +PMU_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}" +PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index edd932cd..dee37978 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -58,8 +58,8 @@ QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" # PMU instance args PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf" -PMU_FIRMWARE_DEPLOY_DIR ?= "${@ '${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu' if d.getVar('BMULTICONFIG') == 'pmu' else '${TOPDIR}/tmp/deploy/images/${MACHINE}'}" -PMU_FIRMWARE_IMAGE_NAME ?= "${@ 'pmu-firmware-zynqmp-pmu' if d.getVar('BBMULTICONFIG') == 'pmu' else 'pmu-zcu102-zynqmp'}" +PMU_FIRMWARE_DEPLOY_DIR ?= "${@ '${TOPDIR}/pmutmp/deploy/images/microblaze-pmu' if d.getVar('BBMULTICONFIG') == 'pmu' else '${TOPDIR}/tmp/deploy/images/${MACHINE}'}" +PMU_FIRMWARE_IMAGE_NAME ?= "${@ 'pmu-firmware-microblaze-pmu' if d.getVar('BBMULTICONFIG') == 'pmu' else 'pmu-zcu102-zynqmp'}" QB_PMU_OPT = " \ -M microblaze-fdt \ -- cgit v1.2.3-54-g00ecf