On Tue, Dec 20, 2016 at 10:33:32AM +0100, Lucas Stach wrote: > There is no point in trying to append a UBI root option, if there is > no UBI support in barebox. > > Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> > --- Applied, thanks Sascha > fs/squashfs/squashfs.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c > index c4d0bac97443..4f4a307dafdd 100644 > --- a/fs/squashfs/squashfs.c > +++ b/fs/squashfs/squashfs.c > @@ -120,6 +120,9 @@ void squashfs_set_rootarg(struct squashfs_priv *priv, struct fs_device_d *fsdev) > struct mtd_info *mtd; > char *str; > > + if (!IS_ENABLED(CONFIG_MTD_UBI)) > + return; > + > ubi_vol = ubi_open_volume_cdev(fsdev->cdev, UBI_READONLY); > > if (IS_ERR(ubi_vol)) > -- > 2.11.0 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
