Re: [ptxdist] [PATCH v2] ptxd_make_fit_image: Add support for kernel load/entry addresses

[Roland Hieber <rhi@pengutronix.de>]

On Fri, Nov 13, 2020 at 09:46:47AM +0100, Michael Olbrich wrote:
> On Wed, Nov 11, 2020 at 04:23:39PM +0100, avazquez.dev@gmail.com wrote:
> > diff --git a/scripts/lib/ptxd_make_fit_image.sh b/scripts/lib/ptxd_make_fit_image.sh
> > index 9754d1e..1edf5c5 100644
> > --- a/scripts/lib/ptxd_make_fit_image.sh
> > +++ b/scripts/lib/ptxd_make_fit_image.sh
> > @@ -21,7 +21,20 @@ ptxd_make_image_fit_its() {
> >  			data = /incbin/("${image_kernel}");
> >  			type = "kernel";
> >  			arch = "$(ptxd_get_ptxconf PTXCONF_ARCH_STRING)";
> > +			os = "linux";
> 
> Sascha, setting this is ok for barebox, right?
> 
> >  			compression = "none";
> > +EOF
> > +			if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)" ]; then
> > +			cat << EOF
> 
> The code should be indented to align with the code above.
> 
>     if [ ... ]; then
> 	cat << EOF
> 
> I think.

You can also use the <<- operator here instead to strip all leading tabs
from the here-document, so the ending EOF can be indented as well and
doesn't disturb the reading. It's even specified for POSIX sh too [1] :)
So:

	if [ ... ]; then
		cat <<-EOF
			load = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)>;
		EOF
	fi

[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04

 - Roland


> > +			load = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)>;
> > +EOF
> > +			fi
> > +			if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_ENTRY)" ]; then
> > +			cat << EOF
> 
> same here.
> 
> Michael
> 
> > +			entry = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_ENTRY)>;
> > +EOF
> > +			fi
> > +			cat << EOF
> >  			hash-1 {
> >  				algo = "sha256";
> >  			};
> > @@ -33,6 +46,7 @@ EOF
> >  			description = "initramfs";
> >  			data = /incbin/("${image_initramfs}");
> >  			type = "ramdisk";
> > +			os = "linux";
> >  			compression = "none";
> >  			hash-1 {
> >  				algo = "sha256";

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de