aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-10-15 14:29:13 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-10-27 17:59:46 +1000
commitdb19a075645083165b63814afe4276d5c93463f0 (patch)
treeaf7c58009ef3d81ec5b3892f673e4fda55ddf01e
parent482199188dca59a9d80548758a2bb81a11a2847d (diff)
downloadmeta-xilinx-db19a075645083165b63814afe4276d5c93463f0.tar.gz
meta-xilinx-db19a075645083165b63814afe4276d5c93463f0.tar.bz2
meta-xilinx-db19a075645083165b63814afe4276d5c93463f0.zip
u-boot-xlnx: Rework ELF deploy
* Move ELF deploy out of the u-boot-extra.inc include * Use similar to u-boot.inc naming for the UBOOT_ELF* variables Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-extra.inc17
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx.inc20
2 files changed, 19 insertions, 18 deletions
diff --git a/recipes-bsp/u-boot/u-boot-extra.inc b/recipes-bsp/u-boot/u-boot-extra.inc
index e476b22e..b7569864 100644
--- a/recipes-bsp/u-boot/u-boot-extra.inc
+++ b/recipes-bsp/u-boot/u-boot-extra.inc
@@ -1,23 +1,6 @@
inherit xilinx-utils
-S = "${WORKDIR}/git"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# Also deploy u-boot elf file with same file format as bin file
-UBOOTXTENSION ?= "${XILINX_EXTENSION}-${MACHINE}"
-SRC_ELF ?= "u-boot"
-DEST_ELF ?= "u-boot${UBOOTXTENSION}-${PV}-${PR}.elf"
-ELF_SYMLINK ?= "u-boot${UBOOTXTENSION}.elf"
-do_deploy_append() {
- install ${S}/${SRC_ELF} ${DEPLOYDIR}/${DEST_ELF}
-
- cd ${DEPLOYDIR}
- rm -f ${SRC_ELF} ${ELF_SYMLINK}
- ln -sf ${DEST_ELF} ${ELF_SYMLINK}
- ln -sf ${DEST_ELF} ${SRC_ELF}.elf
-}
-
# Appends the '<layer>/conf/machine/boards' path to FILESEXTRAPATHS for all
# layers (using the ${BBPATH})
FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards', d)}"
diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc
index a2816439..082b72a0 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -6,6 +6,11 @@ XILINX_EXTENSION = "-xilinx"
SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https"
+S = "${WORKDIR}/git"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+include u-boot-extra.inc
+
SPL_BINARY_zynq = "boot.bin"
UBOOT_SUFFIX = "img"
@@ -16,5 +21,18 @@ do_configure_prepend () {
fi
}
-include u-boot-extra.inc
+# U-Boot deploy ELF
+UBOOT_ELF = "u-boot"
+UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
+UBOOT_ELF_BINARY ?= "u-boot.elf"
+UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
+
+do_deploy_append() {
+ if [ ! -z "${UBOOT_ELF}" ]; then
+ install ${S}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE}
+ rm -f ${DEPLOYDIR}/${UBOOT_ELF_BINARY} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
+ ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}
+ ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
+ fi
+}