summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorFranklin S. Cooper Jr <fcooperjr27@gmail.com>2012-09-07 18:42:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 13:01:52 +0100
commit23a6f63f74e42c62167a49c71ca13c86bdf2f851 (patch)
treea9098f8e0319a8f4b78dfc3093722d28e144e0a9 /meta/recipes-bsp/u-boot
parent24288740d0bf0c4e381ee942857a88c23647eafc (diff)
downloadpoky-23a6f63f74e42c62167a49c71ca13c86bdf2f851.tar.gz
u-boot: Use fw_env.config if available.
* Add support for board specific fw_env.config file if available. (From OE-Core rev: 5b6a8e987f9039aca63d97bc42421b78acab8a3d) Signed-off-by: Franklin S. Cooper Jr <fcooper27jr@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc16
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2011.03.bb2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2011.06.bb2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb2
4 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index a8642f0b06..ae53b9019c 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -49,6 +49,11 @@ do_install () {
49 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} 49 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
50 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} 50 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
51 51
52 if [ -e ${WORKDIR}/fw_env.config ] ; then
53 install -d ${D}${sysconfdir}
54 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
55 fi
56
52 if [ "x${SPL_BINARY}" != "x" ] 57 if [ "x${SPL_BINARY}" != "x" ]
53 then 58 then
54 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} 59 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
@@ -56,16 +61,17 @@ do_install () {
56 fi 61 fi
57} 62}
58 63
59FILES_${PN} = "/boot" 64FILES_${PN} = "/boot ${sysconfdir}"
60FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:" 65FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
61 66
62do_deploy () { 67do_deploy () {
63 install -d ${DEPLOYDIR} 68 install -d ${DEPLOYDIR}
64 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} 69 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
65 70
66 cd ${DEPLOYDIR} 71 cd ${DEPLOYDIR}
67 rm -f ${UBOOT_SYMLINK} 72 rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
68 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} 73 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
74 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
69 75
70 if [ "x${SPL_BINARY}" != "x" ] 76 if [ "x${SPL_BINARY}" != "x" ]
71 then 77 then
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
index 84653958c9..a9cbeca167 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
15SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" 15SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca"
16 16
17PV = "v2011.03+git${SRCPV}" 17PV = "v2011.03+git${SRCPV}"
18PR = "r7" 18PR = "r8"
19 19
20SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 20SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
21 21
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
index 9654795744..a115ed2801 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
15SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" 15SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
16 16
17PV = "v2011.06+git${SRCPV}" 17PV = "v2011.06+git${SRCPV}"
18PR = "r2" 18PR = "r3"
19 19
20SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 20SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
21 21
diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
index c4ec50d6aa..6c099b1603 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
20SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" 20SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
21 21
22PV = "v2012.04.01+git${SRCPV}" 22PV = "v2012.04.01+git${SRCPV}"
23PR = "r1" 23PR = "r2"
24 24
25SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 25SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
26 26