From: Sam Ravnborg <sam@ravnborg.org>
To: Lucas Stach <l.stach@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 2/2] imx-bbu-nand-fcb: fix build on MX28 only
Date: Sat, 16 Sep 2017 15:48:09 +0200 [thread overview]
Message-ID: <20170916134809.GC6457@ravnborg.org> (raw)
In-Reply-To: <20170915090708.29889-2-l.stach@pengutronix.de>
Hi Lucas.
On Fri, Sep 15, 2017 at 11:07:08AM +0200, Lucas Stach wrote:
> This code may be compiled without ARCH_IMX6 present, so it must not
> depend on any functions provided by the architecture support.
>
> Fixes: a2618c215bff (imx-bbu-nand-fcb: add support for imx6ul)
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> common/imx-bbu-nand-fcb.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/common/imx-bbu-nand-fcb.c b/common/imx-bbu-nand-fcb.c
> index 7218c5e1ccda..bd539bafa7f7 100644
> --- a/common/imx-bbu-nand-fcb.c
> +++ b/common/imx-bbu-nand-fcb.c
> @@ -38,9 +38,12 @@
> #include <io.h>
> #include <crc.h>
> #include <mach/generic.h>
> -#include <mach/imx6.h>
> #include <mtd/mtd-peb.h>
>
> +#ifdef CONFIG_ARCH_IMX6
> +#include <mach/imx6.h>
> +#endif
> +
> struct dbbt_block {
> uint32_t Checksum;
> uint32_t FingerPrint;
> @@ -141,7 +144,8 @@ static uint8_t reverse_bit(uint8_t b)
> return b;
> }
>
> -static void encode_bch_ecc(void *buf, struct fcb_block *fcb, int eccbits)
> +static void __maybe_unused encode_bch_ecc(void *buf, struct fcb_block *fcb,
> + int eccbits)
> {
> int i, j, m = 13;
> int blocksize = 128;
> @@ -441,9 +445,11 @@ static int read_fcb(struct mtd_info *mtd, int num, struct fcb_block **retfcb)
> goto err;
> }
>
> +#if IS_ENABLED(CONFIG_ARCH_IMX6)
> if (cpu_is_mx6ul() || cpu_is_mx6ull())
> fcb = read_fcb_bch(rawpage, 40);
> else
> +#endif
> fcb = read_fcb_hamming_13_8(rawpage);
ifdef out an if else like this is ugly and confusing.
Consider using the much more readable variant:
if (IS_ENABLED(CONFIG_ARCH_IMX6) && (cpu_is_mx6ul() || cpu_is_mx6ull()))
fcb = read_fcb_bch(rawpage, 40);
else
fcb = read_fcb_hamming_13_8(rawpage);
Same goes for next chunk in this patch.
Sam
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-09-16 13:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 9:07 [PATCH 1/2] ARM: imx: santaro: select i2c Lucas Stach
2017-09-15 9:07 ` [PATCH 2/2] imx-bbu-nand-fcb: fix build on MX28 only Lucas Stach
2017-09-16 13:48 ` Sam Ravnborg [this message]
2017-09-20 6:50 ` Sascha Hauer
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=20170916134809.GC6457@ravnborg.org \
--to=sam@ravnborg.org \
--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