summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranklin S. Cooper Jr <fcooperjr27@gmail.com>2012-09-17 18:12:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:17 (GMT)
commitcfd36177f70e00ef472b7ef6115dd1028d9c09a3 (patch)
tree1055b6e03ec7bb4af96818044f5f0ced117a1efd
parent1ecc27c20c0f8cc803f731cadad08617aa41cbc1 (diff)
downloadpoky-cfd36177f70e00ef472b7ef6115dd1028d9c09a3.tar.gz
u-boot: Use fw_env.config if avaliable
* Add support for board specific fw_env.config file if avaliable (From OE-Core rev: 4bc2151d6bb500b0489bc00bce7574dc24f41b90) Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
3 files changed, 13 insertions, 7 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index e627e97..3086814 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -48,6 +48,11 @@ do_install () {
48 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} 48 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
49 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} 49 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
50 50
51 if [ -e ${WORKDIR}/fw_env.config ] ; then
52 install -d ${D}${sysconfdir}
53 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
54 fi
55
51 if [ "x${SPL_BINARY}" != "x" ] 56 if [ "x${SPL_BINARY}" != "x" ]
52 then 57 then
53 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} 58 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
@@ -55,15 +60,16 @@ do_install () {
55 fi 60 fi
56} 61}
57 62
58FILES_${PN} = "/boot" 63FILES_${PN} = "/boot ${sysconfdir}"
59 64
60do_deploy () { 65do_deploy () {
61 install -d ${DEPLOYDIR} 66 install -d ${DEPLOYDIR}
62 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} 67 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
63 68
64 cd ${DEPLOYDIR} 69 cd ${DEPLOYDIR}
65 rm -f ${UBOOT_SYMLINK} 70 rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
66 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} 71 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
72 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
67 73
68 if [ "x${SPL_BINARY}" != "x" ] 74 if [ "x${SPL_BINARY}" != "x" ]
69 then 75 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 5d79e1a..fa328d1 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}"
17SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" 17SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca"
18 18
19PV = "v2011.03+git${SRCPV}" 19PV = "v2011.03+git${SRCPV}"
20PR = "r7" 20PR = "r8"
21 21
22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
23 23
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 43f2c06..93b7923 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}"
17SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" 17SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
18 18
19PV = "v2011.06+git${SRCPV}" 19PV = "v2011.06+git${SRCPV}"
20PR = "r2" 20PR = "r3"
21 21
22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
23 23