diff options
| author | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-09-16 09:38:10 -0700 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-09-30 09:51:44 -0700 |
| commit | 4882f3643717df44af864f6d2133e90f524923c0 (patch) | |
| tree | 58edc4a275d89f56a5370e70bf33958eeaf29e94 | |
| parent | bfd1551e68bd4ff084d637839944d3cf1f316042 (diff) | |
| download | meta-xilinx-4882f3643717df44af864f6d2133e90f524923c0.tar.gz | |
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 <chandana.kalluri@xilinx.com>
| -rw-r--r-- | meta-xilinx-bsp/conf/local.conf.sample | 4 | ||||
| -rw-r--r-- | 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" | |||
| 223 | # RM_WORK_EXCLUDE += "u-boot-xlnx-dev" | 223 | # RM_WORK_EXCLUDE += "u-boot-xlnx-dev" |
| 224 | 224 | ||
| 225 | #Add below lines to use runqemu for ZU+ machines | 225 | #Add below lines to use runqemu for ZU+ machines |
| 226 | PMU_FIRMWARE_DEPLOY_DIR = "${DEPLOY_DIR_IMAGE}" | 226 | PMU_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}" |
| 227 | PMU_FIRMWARE_IMAGE_NAME = "pmu-firmware-${MACHINE}" | 227 | PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}" |
| 228 | 228 | ||
| 229 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to | 229 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to |
| 230 | # track the version of this file when it was generated. This can safely be ignored if | 230 | # 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" | |||
| 58 | 58 | ||
| 59 | # PMU instance args | 59 | # PMU instance args |
| 60 | PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf" | 60 | PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf" |
| 61 | PMU_FIRMWARE_DEPLOY_DIR ?= "${@ '${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu' if d.getVar('BMULTICONFIG') == 'pmu' else '${TOPDIR}/tmp/deploy/images/${MACHINE}'}" | 61 | PMU_FIRMWARE_DEPLOY_DIR ?= "${@ '${TOPDIR}/pmutmp/deploy/images/microblaze-pmu' if d.getVar('BBMULTICONFIG') == 'pmu' else '${TOPDIR}/tmp/deploy/images/${MACHINE}'}" |
| 62 | PMU_FIRMWARE_IMAGE_NAME ?= "${@ 'pmu-firmware-zynqmp-pmu' if d.getVar('BBMULTICONFIG') == 'pmu' else 'pmu-zcu102-zynqmp'}" | 62 | PMU_FIRMWARE_IMAGE_NAME ?= "${@ 'pmu-firmware-microblaze-pmu' if d.getVar('BBMULTICONFIG') == 'pmu' else 'pmu-zcu102-zynqmp'}" |
| 63 | 63 | ||
| 64 | QB_PMU_OPT = " \ | 64 | QB_PMU_OPT = " \ |
| 65 | -M microblaze-fdt \ | 65 | -M microblaze-fdt \ |