[meta-xilinx] [PATCH] arm-trusted-firmware: Use constants for memory addresses

Mike Looijmans mike.looijmans at topic.nl
Sun Sep 4 23:55:59 PDT 2016


Define ZYNQMP_ATF_MEM_BASE and ZYNQMP_ATF_MEM_SIZE and pass these through
to the compiler and image tool. This ensures that the code and the image
use the same values.

Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
---
 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb
index f384f5b..7254e4a 100644
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb
@@ -31,12 +31,15 @@ LDFLAGS[unexport] = "1"
 AS[unexport] = "1"
 LD[unexport] = "1"
 
+ZYNQMP_ATF_MEM_BASE = "0xfffe5000"
+ZYNQMP_ATF_MEM_SIZE =    "0x16000"
+
 do_configure() {
 	:
 }
 
 do_compile() {
-	oe_runmake PLAT=${PLATFORM} RESET_TO_BL31=1 bl31
+	oe_runmake ZYNQMP_ATF_MEM_BASE=${ZYNQMP_ATF_MEM_BASE} ZYNQMP_ATF_MEM_SIZE=${ZYNQMP_ATF_MEM_SIZE} ERROR_DEPRECATED=1 PLAT=${PLATFORM} RESET_TO_BL31=1 bl31
 }
 
 do_install() {
@@ -47,6 +50,6 @@ do_deploy() {
 	install -d ${DEPLOYDIR}
 	install -m 0644 ${S}/build/${PLATFORM}/release/bl31/bl31.elf ${DEPLOYDIR}/bl31-${MACHINE}.elf
 	install -m 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${MACHINE}.bin
-	mkimage -A arm64 -O linux -T kernel -C none -a 0xfffe5000 -e 0xfffe5000 -d ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/atf.ub
+	mkimage -A arm64 -O linux -T kernel -C none -a ${ZYNQMP_ATF_MEM_BASE} -e ${ZYNQMP_ATF_MEM_BASE} -d ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/atf.ub
 }
 addtask deploy before do_build after do_compile
-- 
1.9.1




More information about the meta-xilinx mailing list