From 54e2729ed43f82b8cfd96395fb68e447a9b60f86 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Fri, 2 Feb 2018 15:15:58 -0800 Subject: zcu102-zynqmp.conf: Use ATF and u-boot instead of u-boot-spl.bin Use ATF and u-boot.elf while booting using QEMU instead of u-boot-spl.bin. The ATF code is fixed not to fail while looking for FSBL. Also adopt to using pmu-firmware-${MACHINE} name change Reviewed-by: Alistair Francis Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index fe411483..77a441a3 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -54,7 +54,8 @@ QB_SYSTEM_NAME_append = "-multiarch" QB_OPT_APPEND_append_qemuboot-xilinx = " \ -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \ ${@qemu_zynqmp_unhalt(d, True)} \ - -device loader,addr=0xfffc0000,file=${DEPLOY_DIR_IMAGE}/u-boot-spl.bin,cpu-num=0 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \ " # Attach the rootfs disk image to the second SD interface of QEMU (which is SD0) @@ -69,7 +70,7 @@ QB_PMU_OPT = " \ -display none \ -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zynqmp-pmu.dtb \ -kernel ${PMU_ROM} \ - -device loader,file=${DEPLOY_DIR_IMAGE}/pmu-${MACHINE}.elf \ + -device loader,file=${DEPLOY_DIR_IMAGE}/pmu-firmware-${MACHINE}.elf \ -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \ -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \ " -- cgit v1.2.3-54-g00ecf