diff options
| author | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2017-05-26 14:54:24 -0700 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2017-05-30 18:54:09 +1000 |
| commit | 7dea558bf35c2c7087022851ad6a257530704a58 (patch) | |
| tree | e311701c7255e04dc7d56be7cc57dd83594ab7ad | |
| parent | c017b2a016429560223a0f8654994bc772977460 (diff) | |
| download | meta-xilinx-7dea558bf35c2c7087022851ad6a257530704a58.tar.gz | |
arm-trusted-firmware_git.bb: Make ATF machine independent
Make arm-trusted-firmware machine independent
Signed-off-by: Cyril Chemparathy <cyril.chemparathy@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Reviewed-by: Nathan Rossi <nathan@nathanrossi.com>
| -rw-r--r-- | conf/machine/zcu102-zynqmp.conf | 2 | ||||
| -rw-r--r-- | recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf index 2be85b92..679a2e9c 100644 --- a/conf/machine/zcu102-zynqmp.conf +++ b/conf/machine/zcu102-zynqmp.conf | |||
| @@ -43,7 +43,7 @@ PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native" | |||
| 43 | QB_OPT_APPEND_append_qemuboot-xilinx = " \ | 43 | QB_OPT_APPEND_append_qemuboot-xilinx = " \ |
| 44 | -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb \ | 44 | -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb \ |
| 45 | -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 \ | 45 | -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 \ |
| 46 | -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware-${MACHINE}.elf,cpu-num=0 \ | 46 | -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \ |
| 47 | -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \ | 47 | -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \ |
| 48 | " | 48 | " |
| 49 | 49 | ||
diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index b841fa16..4ce954fb 100644 --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | |||
| @@ -43,8 +43,8 @@ OUTPUT_DIR = "${B}/${PLATFORM}/release" | |||
| 43 | 43 | ||
| 44 | do_deploy() { | 44 | do_deploy() { |
| 45 | install -d ${DEPLOYDIR} | 45 | install -d ${DEPLOYDIR} |
| 46 | install -m 0644 ${OUTPUT_DIR}/bl31/bl31.elf ${DEPLOYDIR}/arm-trusted-firmware-${MACHINE}.elf | 46 | install -m 0644 ${OUTPUT_DIR}/bl31/bl31.elf ${DEPLOYDIR}/arm-trusted-firmware.elf |
| 47 | install -m 0644 ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/arm-trusted-firmware-${MACHINE}.bin | 47 | install -m 0644 ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/arm-trusted-firmware.bin |
| 48 | 48 | ||
| 49 | # Get the entry point address from the elf. | 49 | # Get the entry point address from the elf. |
| 50 | BL31_BASE_ADDR=$(${READELF} -h ${OUTPUT_DIR}/bl31/bl31.elf | egrep -m 1 -i "entry point.*?0x" | sed -r 's/.*?(0x.*?)/\1/g') | 50 | BL31_BASE_ADDR=$(${READELF} -h ${OUTPUT_DIR}/bl31/bl31.elf | egrep -m 1 -i "entry point.*?0x" | sed -r 's/.*?(0x.*?)/\1/g') |