summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-02-18 18:59:31 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-02-19 18:00:12 +1000
commit3c38dc0b469920b87cbd9f32d5c97c139254229c (patch)
tree9126f78c76bf12ec1a511a78a7f41a9b3ce4a1eb
parentad6d76d8d8a839c4ac7a15166e8bbda866f49390 (diff)
downloadmeta-xilinx-3c38dc0b469920b87cbd9f32d5c97c139254229c.tar.gz
u-boot-xlnx: Split ELF deploy into seperate include file
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-elf.inc15
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx.inc16
2 files changed, 16 insertions, 15 deletions
diff --git a/recipes-bsp/u-boot/u-boot-elf.inc b/recipes-bsp/u-boot/u-boot-elf.inc
new file mode 100644
index 00000000..547a9fd3
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-elf.inc
@@ -0,0 +1,15 @@
1# U-Boot deploy ELF
2UBOOT_ELF = "u-boot"
3UBOOT_ELF_aarch64 = "u-boot.elf"
4UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
5UBOOT_ELF_BINARY ?= "u-boot.elf"
6UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
7
8do_deploy_append() {
9 if [ ! -z "${UBOOT_ELF}" ]; then
10 install ${S}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE}
11 rm -f ${DEPLOYDIR}/${UBOOT_ELF_BINARY} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
12 ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}
13 ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
14 fi
15}
diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc
index 2eac46e5..b3de0974 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -1,4 +1,5 @@
1require recipes-bsp/u-boot/u-boot.inc 1require recipes-bsp/u-boot/u-boot.inc
2require u-boot-elf.inc
2 3
3LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
4 5
@@ -20,18 +21,3 @@ do_configure_prepend () {
20 fi 21 fi
21} 22}
22 23
23# U-Boot deploy ELF
24UBOOT_ELF = "u-boot"
25UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
26UBOOT_ELF_BINARY ?= "u-boot.elf"
27UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
28
29do_deploy_append() {
30 if [ ! -z "${UBOOT_ELF}" ]; then
31 install ${S}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE}
32 rm -f ${DEPLOYDIR}/${UBOOT_ELF_BINARY} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
33 ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}
34 ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
35 fi
36}
37