[OE-core] [oe-core] linux-dtb: add multi-dtb build support
Saul Wold
sgw at linux.intel.com
Mon Jul 16 22:48:47 UTC 2012
On 06/25/2012 08:53 PM, b19537 at freescale.com wrote:
> From: Zhenhua Luo <b19537 at freescale.com>
>
> 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
>
> Signed-off-by: Zhenhua Luo <b19537 at freescale.com>
> ---
> meta/recipes-kernel/linux/linux-dtb.inc | 36 +++++++++++++++++++++++++------
> 1 files changed, 29 insertions(+), 7 deletions(-)
>
This patch appears to rename the .dtb file different than it did before
this change. Is that correct?
Seem to change it from:
uImage-mpc8315e-rdb.dtb
to
uImage-mpc8315erdb.dtb
While the .bin file is still: uImage-mpc8315e-rdb.bin
Inquiring minds?? This was filed as bug 2769
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2769
Thanks
Sau!
> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
> index 9188cee..8aa1458 100644
> --- a/meta/recipes-kernel/linux/linux-dtb.inc
> +++ b/meta/recipes-kernel/linux/linux-dtb.inc
> @@ -15,13 +15,35 @@ python __anonymous () {
>
> do_install_append() {
> if test -n "${KERNEL_DEVICETREE}"; then
> - dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE}
> - install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION}
> - install -d ${DEPLOYDIR}
> - install -m 0644 devicetree ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.dtb
> - cd ${DEPLOYDIR}
> - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
> - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
> + for DTS_FILE in ${KERNEL_DEVICETREE}; do
> + if [ ! -f ${DTS_FILE} ]; then
> + echo "Warning: ${DTS_FILE} is not available!"
> + continue
> + fi
> + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
> + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> + dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE}
> + install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb
> + done
> fi
> }
>
> +do_deploy_append() {
> + if test -n "${KERNEL_DEVICETREE}"; then
> + for DTS_FILE in ${KERNEL_DEVICETREE}; do
> + if [ ! -f ${DTS_FILE} ]; then
> + echo "Warning: ${DTS_FILE} is not available!"
> + continue
> + fi
> + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
> + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> + install -d ${DEPLOYDIR}
> + install -m 0644 ${B}/${DTS_BASE_NAME} ${DEPLOYDIR}/${DTB_NAME}.dtb
> + cd ${DEPLOYDIR}
> + ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
> + cd -
> + done
> + fi
> +}
>
More information about the Openembedded-core
mailing list