[PATCH] image_types_fsl.bbclass: make sdcard compatible with fitImage

[PATCH] image_types_fsl.bbclass: make sdcard compatible with fitImage

[S. Lockwood-Childs]

Fixes error along the lines of
  ERROR: imx-blah.dtb does not exist.

The sdcard image format was assuming all applicable devicetree files
would be available in the deploy area. This is not the case for
fitImage kernel format, which packs both the kernel and all enabled
devicetree files into a single file.

Treat fitImage as an exception, skipping separate install of dtb files
since they get installed as part of the kernel file instead.

Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
---
 classes/image_types_fsl.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 4709af9..cde1af7 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -97,7 +97,7 @@ _generate_boot_image() {
 	done
 
 	# Copy device tree file
-	if test -n "${KERNEL_DEVICETREE}"; then
+	if [ -n "${KERNEL_DEVICETREE}" -a ${KERNEL_IMAGETYPE} != fitImage ]; then
 		for DTS_FILE in ${KERNEL_DEVICETREE}; do
 			DTS_BASE_NAME=`basename ${DTS_FILE} .dtb`
 			if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
-- 
1.9.4

Re: [PATCH] image_types_fsl.bbclass: make sdcard compatible with fitImage

[Otavio Salvador]

On Fri, Oct 27, 2017 at 7:03 AM, S. Lockwood-Childs <sjl@vctlabs.com> wrote:
> Fixes error along the lines of
>   ERROR: imx-blah.dtb does not exist.
>
> The sdcard image format was assuming all applicable devicetree files
> would be available in the deploy area. This is not the case for
> fitImage kernel format, which packs both the kernel and all enabled
> devicetree files into a single file.
>
> Treat fitImage as an exception, skipping separate install of dtb files
> since they get installed as part of the kernel file instead.
>
> Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>

Thanks for sending this; one question though ... did you try to do the
same using wic?

We are deprecating the class use for rocko and will soon remove the
sdcard generation from it, so it'd be good if you could try the wic
... it is very straightforward  and we use it internally with a
fitImage :-)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750