mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 14/17] ARM: i.MX7: boot: Move magic numbers into utility functions
Date: Sat, 14 Apr 2018 10:51:00 -0700	[thread overview]
Message-ID: <20180414175103.10125-15-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180414175103.10125-1-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/boot.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index cdfe3749d..0398804b0 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -362,6 +362,16 @@ static unsigned int imx7_bootsource_internal(uint32_t r)
 	return sbmr(r, 15, 12);	/* BOOT_CFG[15:12] */
 }
 
+static int imx7_boot_instance_spi_nor(uint32_t r)
+{
+	return sbmr(r, 11, 9);	/* BOOT_CFG[11:9] */
+}
+
+static int imx7_boot_instance_mmc(uint32_t r)
+{
+	return sbmr(r, 11, 10);	/* BOOT_CFG[11:10] */
+}
+
 struct imx_boot_sw_info {
 	uint8_t  reserved_1;
 	uint8_t  boot_device_instance;
@@ -417,14 +427,14 @@ void imx7_get_boot_source(enum bootsource *src, int *instance)
 	case 1:
 	case 2:
 		*src = BOOTSOURCE_MMC;
-		*instance = (sbmr1 >> 10 & 0x3);
+		*instance = imx7_boot_instance_mmc(sbmr1);
 		break;
 	case 3:
 		*src = BOOTSOURCE_NAND;
 		break;
 	case 6:
 		*src = BOOTSOURCE_SPI_NOR,
-		*instance = (sbmr1 >> 9 & 0x7);
+		*instance = imx7_boot_instance_spi_nor(sbmr1);
 		break;
 	case 4:
 		*src = BOOTSOURCE_SPI; /* Really: qspi */
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-04-14 17:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-14 17:50 [PATCH 00/17] i.MX bootsource bugfixes, refactoring and VFxxx support Andrey Smirnov
2018-04-14 17:50 ` [PATCH 01/17] ARM: i.MX: boot: Coalesce copy-pasted code Andrey Smirnov
2018-04-14 17:50 ` [PATCH 02/17] ARM: i.MX: Add function to extract BMOD value Andrey Smirnov
2018-04-16  7:37   ` Sascha Hauer
2018-04-16 13:36     ` Andrey Smirnov
2018-04-14 17:50 ` [PATCH 03/17] ARM: i.MX: Simplify serial bootsource detection for i.MX6 and 7 Andrey Smirnov
2018-04-14 17:50 ` [PATCH 04/17] ARM: i.MX: Account for unprogrammed fuses on i.MX6 and i.MX7 Andrey Smirnov
2018-04-14 17:50 ` [PATCH 05/17] ARM: i.MX7: boot: Add code to handle SD/MMC manufacture mode Andrey Smirnov
2018-04-14 17:50 ` [PATCH 06/17] ARM: i.MX7: boot: Remove incorrect NAND bootsource detection Andrey Smirnov
2018-04-14 17:50 ` [PATCH 07/17] ARM: i.MX7: boot: Fix SPI-NOR/QSPI boot source mixup Andrey Smirnov
2018-04-14 17:50 ` [PATCH 08/17] ARM: i.MX: boot: Remove unnecessary retruns Andrey Smirnov
2018-04-15  2:22   ` Marc Reilly
2018-04-16 16:34     ` Andrey Smirnov
2018-04-14 17:50 ` [PATCH 09/17] ARM: i.MX: boot: Move magic values into small functions Andrey Smirnov
2018-04-15  2:24   ` Marc Reilly
2018-04-16 16:33     ` Andrey Smirnov
2018-04-14 17:50 ` [PATCH 10/17] ARM: i.MX: boot: Share code to detect NAND as a boot source Andrey Smirnov
2018-04-14 17:50 ` [PATCH 11/17] ARM: i.MX: boot: Check for NAND boot only if necessary on i.MX53, 6 Andrey Smirnov
2018-04-14 17:50 ` [PATCH 12/17] ARM: i.MX53: boot: Move magic numbers info utility functions Andrey Smirnov
2018-04-14 17:50 ` [PATCH 13/17] ARM: i.MX6: boot: Move magic numbers into " Andrey Smirnov
2018-04-14 17:51 ` Andrey Smirnov [this message]
2018-04-14 17:51 ` [PATCH 15/17] bootsource: Add BOOTSOURCE_CAN Andrey Smirnov
2018-04-14 17:51 ` [PATCH 16/17] ARM: VFxxx: Implement code to detect bootsource Andrey Smirnov
2018-04-14 17:51 ` [PATCH 17/17] ARM: i.MX6: boot: Return BOOTSOURCE_SPI_NOR, not BOOTSOURCE_SPI Andrey Smirnov

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=20180414175103.10125-15-andrew.smirnov@gmail.com \
    --to=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