summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAsh Charles <ashcharles@gmail.com>2014-06-24 13:10:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 13:51:46 +0100
commit02a6b7b205bb928b778b88a17e7c86bcbc74b069 (patch)
tree06c19fca59f3fa812885f77b6a1bdd3b6fe4af16 /meta
parentf3d2e32a144ae10705db8cfdb945661f04222eae (diff)
downloadpoky-02a6b7b205bb928b778b88a17e7c86bcbc74b069.tar.gz
u-boot: Optionally deploy an environment or script file
Some boards are configured to read a script or environment file as part of the u-boot boot sequence. This file, typically called 'uEnv.txt' or 'boot.scr', would be deployed alongside the u-boot binary. If a recipe uses this u-boot.inc, such a file can be deployed by setting the optional UBOOT_ENV parameter and including the file in the SRC_URI. For example: SRC_URI_append_overo = "file://uEnv.txt" UBOOT_ENV_overo = "uEnv" (From OE-Core rev: 1506c40c93651356b9fe2f7184b5e26f99e22686) Signed-off-by: Ash Charles <ashcharles@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index d826a40c9c..53c87c28f0 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -28,6 +28,17 @@ SPL_BINARY ?= ""
28SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}" 28SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
29SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" 29SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
30 30
31# Additional environment variables or a script can be installed alongside
32# u-boot to be used automatically on boot. This file, typically 'uEnv.txt'
33# or 'boot.scr', should be packaged along with u-boot as well as placed in the
34# deploy directory. Machine configurations needing one of these files should
35# include it in the SRC_URI and set the UBOOT_ENV parameter.
36UBOOT_ENV_SUFFIX ?= "txt"
37UBOOT_ENV ?= ""
38UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"
39UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}"
40UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
41
31do_compile () { 42do_compile () {
32 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then 43 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
33 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk 44 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
@@ -62,6 +73,12 @@ do_install () {
62 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} 73 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
63 ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} 74 ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
64 fi 75 fi
76
77 if [ "x${UBOOT_ENV}" != "x" ]
78 then
79 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE}
80 ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY}
81 fi
65} 82}
66 83
67FILES_${PN} = "/boot ${sysconfdir}" 84FILES_${PN} = "/boot ${sysconfdir}"
@@ -82,6 +99,14 @@ do_deploy () {
82 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY} 99 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
83 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} 100 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
84 fi 101 fi
102
103 if [ "x${UBOOT_ENV}" != "x" ]
104 then
105 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE}
106 rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK}
107 ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY}
108 ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK}
109 fi
85} 110}
86 111
87addtask deploy before do_build after do_compile 112addtask deploy before do_build after do_compile