From: Sascha Hauer <s.hauer@pengutronix.de>
To: Lucas Stach <l.stach@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in
Date: Mon, 9 Jan 2017 11:25:12 +0100 [thread overview]
Message-ID: <20170109102512.zlxa6i3hrtuhxb66@pengutronix.de> (raw)
In-Reply-To: <20161220093340.14404-1-l.stach@pengutronix.de>
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@pengutronix.de>
> ---
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@lists.infradead.org
> 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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2017-01-09 10:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 9:33 Lucas Stach
2016-12-20 9:33 ` [PATCH 2/9] arm64: disable PBL support Lucas Stach
2016-12-20 9:33 ` [PATCH 3/9] net: e1000: don't try to register eeprom if MTD support is missing Lucas Stach
2016-12-20 9:33 ` [PATCH 4/9] globalvar: select FNMATCH Lucas Stach
2016-12-20 9:33 ` [PATCH 5/9] nvvar: add static inline dummy for nvvar_save Lucas Stach
2016-12-20 9:33 ` [PATCH 6/9] devparam: add static inline dummy for dev_add_param_bitmask Lucas Stach
2016-12-20 9:33 ` [PATCH 7/9] arm: pbl: rename linker script for uncompressed image data Lucas Stach
2016-12-20 9:33 ` [PATCH 8/9] lib: add generic find_bit implementation from Linux and use in ARMv8 Lucas Stach
2017-01-09 16:05 ` Sascha Hauer
2016-12-20 9:33 ` [PATCH 9/9] arm: ARM64 doesn't provide the armlinux_* functions Lucas Stach
2017-01-09 10:25 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170109102512.zlxa6i3hrtuhxb66@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=l.stach@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox