aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-bsp
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-06-16 09:51:49 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-07-10 14:34:20 -0300
commit8ee68d13dfd8efb99f154cce6ec3172c8137a0b1 (patch)
treedaa251378a2fc1503571d870cc4eacbb077fe70e /recipes-bsp
parenta207ac2953cdc046acef3190f58816df79119f1b (diff)
downloadmeta-fsl-arm-8ee68d13dfd8efb99f154cce6ec3172c8137a0b1.tar.gz
meta-fsl-arm-8ee68d13dfd8efb99f154cce6ec3172c8137a0b1.tar.bz2
meta-fsl-arm-8ee68d13dfd8efb99f154cce6ec3172c8137a0b1.zip
imx-bootlets: allow use of a zImage with appended device tree info
For use of kernels, with device tree, and imx-bootlets we need to append it to the kernel image and use it for the linux.sb file. To avoid changing the built kernel we append a -dtb suffix for the binary name. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch2
-rw-r--r--recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb10
2 files changed, 7 insertions, 5 deletions
diff --git a/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch b/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch
index abcf5b0..d54add1 100644
--- a/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch
+++ b/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch
@@ -22,7 +22,7 @@ index 516f4f2..366ac22 100644
+ power_prep="imx-bootlets-power_prep-@MACHINE@";
+ sdram_prep="imx-bootlets-boot_prep-@MACHINE@";
+ linux_prep="imx-bootlets-linux_prep-@MACHINE@";
-+ zImage="zImage-@MACHINE@.bin";
++ zImage="zImage-@MACHINE@.bin@DTB@";
}
section (0) {
diff --git a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb
index d2f51fd..6cea049 100644
--- a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb
+++ b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "i.MXS boot streams"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://download.ossystems.com.br/bsp/freescale/source/imx-bootlets-src-${PV}.tar.gz \
file://linux-fix-paths.patch \
@@ -30,7 +30,8 @@ python () {
do_configure () {
# Use machine specific binaries
- sed -i 's,@MACHINE@,${MACHINE},g' linux.bd
+ sed 's,@MACHINE@,${MACHINE},g;s,@DTB@,-dtb,g' < linux.bd > linux.bd-dtb
+ sed -i 's,@MACHINE@,${MACHINE},g;s,@DTB@,,g' linux.bd
}
do_compile () {
@@ -42,7 +43,8 @@ do_compile () {
do_install () {
install -d ${D}/boot/
install -m 644 boot_prep/boot_prep power_prep/power_prep \
- linux_prep/output-target/linux_prep linux.bd \
+ linux_prep/output-target/linux_prep \
+ linux.bd linux.bd-dtb \
${D}/boot
}
@@ -54,7 +56,7 @@ do_deploy () {
for f in boot_prep/boot_prep \
power_prep/power_prep \
linux_prep/output-target/linux_prep \
- linux.bd; do
+ linux.bd linux.bd-dtb; do
full_name="imx-bootlets-`basename $f`-${MACHINE}-${PV}-${PR}"
symlink_name="imx-bootlets-`basename $f`-${MACHINE}"