[PATCH 1/3] kernel-fitimage: Support ext2.gz filesystems

[PATCH 1/3] kernel-fitimage: Support ext2.gz filesystems

[Chunrong Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 meta/classes/kernel-fitimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2630b47..f40fbf3 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -369,7 +369,7 @@ fitimage_assemble() {
 	#
 	if [ "x${ramdiskcount}" = "x1" ] ; then
 		# Find and use the first initramfs image archive type we find
-		for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio; do
+		for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz ext2.gz cpio; do
 			initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.${img}"
 			echo "Using $initramfs_path"
 			if [ -e "${initramfs_path}" ]; then
-- 
1.8.3.2

[PATCH 2/3] kernel-fitimage: set replacementtype to vmlinux

[Chunrong Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 meta/classes/kernel-fitimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index f40fbf3..9fa836f 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -10,7 +10,7 @@ python __anonymous () {
         if d.getVar("UBOOT_ARCH") == "x86":
             replacementtype = "bzImage"
         else:
-            replacementtype = "zImage"
+            replacementtype = "vmlinux"
 
 	# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
 	# to kernel.bbclass . We have to override it, since we pack zImage
-- 
1.8.3.2

[PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue

[Chunrong Guo]

From: Chunrong Guo <chunrong.guo@nxp.com>

    * For example:
      KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"

      ${DTB}= "freescale/fsl-ls1046a-rdb.dtb"

      but only fsl-ls1046a-rdb.dtb  should be used in fit-image.its

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 meta/classes/kernel-fitimage.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 9fa836f..3171d10 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -346,7 +346,10 @@ fitimage_assemble() {
 				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
 				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
 			fi
-			DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
+                          
+			DTB=`basename ${DTB}`
+                        DTB_PATH=`find arch/${ARCH}/boot -name "${DTB}"`
+ 
 			if [ ! -e "${DTB_PATH}" ]; then
 				DTB_PATH="arch/${ARCH}/boot/${DTB}"
 			fi
-- 
1.8.3.2

Re: [PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue

[Anders Darander]

* Chunrong Guo <B40290@freescale.com> [170510 11:02]:

> From: Chunrong Guo <chunrong.guo@nxp.com>

>     * For example:
>       KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"

>       ${DTB}= "freescale/fsl-ls1046a-rdb.dtb"

Why not just change the definition above?

Curious, as that would've been the easiest and quickest solution.

Is the current definition necessary in some other way?

Cheers,
Anders

>       but only fsl-ls1046a-rdb.dtb  should be used in fit-image.its

> -			DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
> +                          
> +			DTB=`basename ${DTB}`
> +                        DTB_PATH=`find arch/${ARCH}/boot -name "${DTB}"`
> + 


-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB

Re: [PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue

[Anders Darander]

* C.R. Guo <chunrong.guo@nxp.com> [170511 06:08]:

> Hello Anders Darander,

> Thanks for your comments.


> dtb inherit Linux-dtb (http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/recipes-kernel/linux/linux-dtb.inc).

> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Anders Darander
> Sent: Wednesday, May 10, 2017 9:21 PM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue

> * Chunrong Guo <B40290@freescale.com> [170510 11:02]:

> > From: Chunrong Guo <chunrong.guo@nxp.com>

> >     * For example:
> >       KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"

> >       ${DTB}= "freescale/fsl-ls1046a-rdb.dtb"

Ah, what I didn't know, is that the dts-files in arch/arm64/boot/dts are
located in subdirectories, as compared to arch/arm/boot/dts, which
directly holds all the dts-files... That explains your problems.

Cheers,
Anders

-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB

Re: [PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue

[Denys Dmytriyenko]

On Wed, May 10, 2017 at 04:47:13PM +0800, Chunrong Guo wrote:
> From: Chunrong Guo <chunrong.guo@nxp.com>
> 
>     * For example:
>       KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"
> 
>       ${DTB}= "freescale/fsl-ls1046a-rdb.dtb"
> 
>       but only fsl-ls1046a-rdb.dtb  should be used in fit-image.its
> 
> Signed-off-by: Chunrong Guo <B40290@freescale.com>
> ---
>  meta/classes/kernel-fitimage.bbclass | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
> index 9fa836f..3171d10 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -346,7 +346,10 @@ fitimage_assemble() {
>  				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
>  				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
>  			fi
> -			DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
> +                          
> +			DTB=`basename ${DTB}`
> +                        DTB_PATH=`find arch/${ARCH}/boot -name "${DTB}"`

Any way to not use "find" here? Shouldn't KERNEL_DEVICETREE and DTB_PATH 
already give you the full path?


> + 
>  			if [ ! -e "${DTB_PATH}" ]; then
>  				DTB_PATH="arch/${ARCH}/boot/${DTB}"
>  			fi
> -- 
> 1.8.3.2
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue

[Denys Dmytriyenko]

On Mon, May 15, 2017 at 03:09:32AM +0000, C.R. Guo wrote:
> Hello Denys ,
> 
> 
> for example:
> KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"

^^^^^^^^^^^^^^^^^^^^


> ${DTB}= "freescale/fsl-ls1046a-rdb.dtb"

^^^^^^^^^^^^^^^^^^^^


> DTB=`basename ${DTB}`
> 
> ${DTB}= "fsl-ls1046a-rdb.dtb"
> 
> if use  DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
> 
> 
> DTB_PATH = ="arch/${ARCH}/boot/dts/fsl-ls1046a-rdb.dtb"
> 
> but  dtb files real path is  arch/${ARCH}/boot/dts/freescale/fsl-ls1046a-rdb.dtb"

The original DTB and KERNEL_DEVICETREE above still have the correct path, 
don't they?

-- 
Denys


> -----Original Message-----
> From: Denys Dmytriyenko [mailto:denis@denix.org] 
> Sent: Friday, May 12, 2017 11:12 PM
> To: Chunrong Guo
> Cc: openembedded-core@lists.openembedded.org; C.R. Guo
> Subject: Re: [OE-core] [PATCH 3/3] kernel-fitimage: fix KERNEL_DEVICETREE includes subdirectory issue
> 
> On Wed, May 10, 2017 at 04:47:13PM +0800, Chunrong Guo wrote:
> > From: Chunrong Guo <chunrong.guo@nxp.com>
> > 
> >     * For example:
> >       KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"
> > 
> >       ${DTB}= "freescale/fsl-ls1046a-rdb.dtb"
> > 
> >       but only fsl-ls1046a-rdb.dtb  should be used in fit-image.its
> > 
> > Signed-off-by: Chunrong Guo <B40290@freescale.com>
> > ---
> >  meta/classes/kernel-fitimage.bbclass | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/kernel-fitimage.bbclass 
> > b/meta/classes/kernel-fitimage.bbclass
> > index 9fa836f..3171d10 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -346,7 +346,10 @@ fitimage_assemble() {
> >  				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
> >  				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
> >  			fi
> > -			DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
> > +                          
> > +			DTB=`basename ${DTB}`
> > +                        DTB_PATH=`find arch/${ARCH}/boot -name 
> > +"${DTB}"`
> 
> Any way to not use "find" here? Shouldn't KERNEL_DEVICETREE and DTB_PATH already give you the full path?
> 
> 
> > + 
> >  			if [ ! -e "${DTB_PATH}" ]; then
> >  				DTB_PATH="arch/${ARCH}/boot/${DTB}"
> >  			fi
> > -- 
> > 1.8.3.2
> > 
> > -- 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>