From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 226C3E00CDC; Mon, 30 May 2016 13:47:13 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [93.17.128.1 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from smtp26.services.sfr.fr (smtp26.services.sfr.fr [93.17.128.1]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 8B14AE00CA6 for ; Mon, 30 May 2016 13:47:12 -0700 (PDT) Received: from localhost.localdomain (LFbn-1-3582-159.w90-127.abo.wanadoo.fr [90.127.97.159]) by msfrf2612.sfr.fr (SMTP Server) with ESMTP id F3CED1C000438; Mon, 30 May 2016 22:47:11 +0200 (CEST) Received: from localhost.localdomain (LFbn-1-3582-159.w90-127.abo.wanadoo.fr [90.127.97.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: herve.jourdain@neuf.fr) by msfrf2612.sfr.fr (SMTP Server) with ESMTPSA; Mon, 30 May 2016 22:47:11 +0200 (CEST) Authentication-Results: sfr.fr; auth=pass (LOGIN) smtp.auth=herve.jourdain@neuf.fr From: Herve Jourdain To: yocto@yoctoproject.org Date: Tue, 31 May 2016 04:46:32 +0800 Message-Id: <1464641195-88380-3-git-send-email-herve.jourdain@neuf.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464641195-88380-1-git-send-email-herve.jourdain@neuf.fr> References: <1464641195-88380-1-git-send-email-herve.jourdain@neuf.fr> X-sfr-mailing: LEGIT MIME-Version: 1.0 Subject: [meta-raspberrypi][PATCH v4 2/5] sdcard_image-rpi.bbclass: support for .dtbo files for dtb overlays X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2016 20:47:13 -0000 Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. Add support for both extensions for overlays (".dtb" and ".dtbo") Signed-off-by: Herve Jourdain --- classes/sdcard_image-rpi.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 4dfd7a3..b3a8bc0 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -110,7 +110,7 @@ IMAGE_CMD_rpi-sdimg () { ;; *) if test -n "${DTS}"; then - # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder + # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder DT_OVERLAYS="${@split_overlays(d, 0)}" DT_ROOT="${@split_overlays(d, 1)}" @@ -124,9 +124,10 @@ IMAGE_CMD_rpi-sdimg () { # Copy device tree overlays to dedicated folder mmd -i ${WORKDIR}/boot.img overlays for DTB in ${DT_OVERLAYS}; do - DTB_BASE_NAME=`basename ${DTB} .dtb` + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT} done fi mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE} -- 2.7.4