From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] ARM: i.MX: boot: Make use of FIELD_GET() in imx51_get_boot_source()
Date: Mon, 24 Sep 2018 08:54:18 +0200 [thread overview]
Message-ID: <20180924065418.GB4097@pengutronix.de> (raw)
In-Reply-To: <20180919154847.1543-1-andrew.smirnov@gmail.com>
On Wed, Sep 19, 2018 at 08:48:46AM -0700, Andrey Smirnov wrote:
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> arch/arm/mach-imx/boot.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index f1fc40479..830ea08f3 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -167,10 +167,10 @@ void imx27_boot_save_loc(void)
> imx_boot_save_loc(imx27_get_boot_source);
> }
>
> -#define IMX51_SRC_SBMR 0x4
> -#define IMX51_SBMR_BT_MEM_TYPE_SHIFT 7
> -#define IMX51_SBMR_BT_MEM_CTL_SHIFT 0
> -#define IMX51_SBMR_BMOD_SHIFT 14
> +#define IMX51_SRC_SBMR 0x4
> +#define IMX51_SBMR_BT_MEM_TYPE GENMASK(8, 7)
> +#define IMX51_SBMR_BT_MEM_CTL GENMASK(1, 0)
> +#define IMX51_SBMR_BMOD GENMASK(15, 14)
>
> void imx51_get_boot_source(enum bootsource *src, int *instance)
> {
> @@ -180,12 +180,12 @@ void imx51_get_boot_source(enum bootsource *src, int *instance)
>
> reg = readl(src_base + IMX51_SRC_SBMR);
>
> - switch ((reg >> IMX51_SBMR_BMOD_SHIFT) & 0x3) {
> + switch (FIELD_GET(IMX51_SBMR_BMOD, reg)) {
> case 0:
> case 2:
> /* internal boot */
> - ctrl = (reg >> IMX51_SBMR_BT_MEM_CTL_SHIFT) & 0x3;
> - type = (reg >> IMX51_SBMR_BT_MEM_TYPE_SHIFT) & 0x3;
> + ctrl = FIELD_GET(IMX51_SBMR_BT_MEM_CTL, reg);
> + type = FIELD_GET(IMX51_SBMR_BT_MEM_TYPE, reg);
>
> *src = locations[ctrl][type];
> break;
> --
> 2.17.1
>
>
> _______________________________________________
> 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:[~2018-09-24 6:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 15:48 Andrey Smirnov
2018-09-19 15:48 ` [PATCH 2/2] ARM: i.MX: boot: Detect boot instance on i.MX51 Andrey Smirnov
2018-09-24 6:54 ` 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=20180924065418.GB4097@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/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