summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenhua Luo <b19537@freescale.com>2012-06-26 11:53:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-28 16:26:44 +0100
commit8c904eb643ad8ca1bc29cb2d870a80b355dcb341 (patch)
treef1a80bfc25804f57a68da59b1f6ffa95a06e990d
parent6c7fccbd0949a5ef622bf2989af7ddae6572fd76 (diff)
downloadpoky-8c904eb643ad8ca1bc29cb2d870a80b355dcb341.tar.gz
linux-dtb: add multi-dtb build support
including following enhancement: * support multi-dtb build * skip dtb build and install when KERNEL_DEVICETREE is empty * print a warning message when specified dts file is not available (From OE-Core rev: 66f7921f34dfa8b3c7f8f7184715214164f3f8b0) Signed-off-by: Zhenhua Luo <b19537@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-dtb.inc36
1 files changed, 29 insertions, 7 deletions
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 9188cee1e4..8aa1458630 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -15,13 +15,35 @@ python __anonymous () {
15 15
16do_install_append() { 16do_install_append() {
17 if test -n "${KERNEL_DEVICETREE}"; then 17 if test -n "${KERNEL_DEVICETREE}"; then
18 dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE} 18 for DTS_FILE in ${KERNEL_DEVICETREE}; do
19 install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION} 19 if [ ! -f ${DTS_FILE} ]; then
20 install -d ${DEPLOYDIR} 20 echo "Warning: ${DTS_FILE} is not available!"
21 install -m 0644 devicetree ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.dtb 21 continue
22 cd ${DEPLOYDIR} 22 fi
23 rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb 23 DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
24 ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb 24 DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
25 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
26 dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE}
27 install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb
28 done
25 fi 29 fi
26} 30}
27 31
32do_deploy_append() {
33 if test -n "${KERNEL_DEVICETREE}"; then
34 for DTS_FILE in ${KERNEL_DEVICETREE}; do
35 if [ ! -f ${DTS_FILE} ]; then
36 echo "Warning: ${DTS_FILE} is not available!"
37 continue
38 fi
39 DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
40 DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
41 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
42 install -d ${DEPLOYDIR}
43 install -m 0644 ${B}/${DTS_BASE_NAME} ${DEPLOYDIR}/${DTB_NAME}.dtb
44 cd ${DEPLOYDIR}
45 ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
46 cd -
47 done
48 fi
49}