From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 12/17] ARM: i.MX53: boot: Move magic numbers info utility functions
Date: Sat, 14 Apr 2018 10:50:58 -0700 [thread overview]
Message-ID: <20180414175103.10125-13-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 | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index 8fbccb260..3cd79acfc 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -169,6 +169,7 @@ void imx51_get_boot_source(enum bootsource *src, int *instance)
}
#define IMX53_SRC_SBMR 0x4
+#define IMX53_BMOD_SERIAL 0b11
static unsigned int sbmr(uint32_t r, unsigned int msb, unsigned int lsb)
{
@@ -187,17 +188,27 @@ static int imx53_bootsource_internal(uint32_t r)
return sbmr(r, 7, 4); /* BOOT_CFG1[7:4] */
}
+static int imx53_port_select(uint32_t r)
+{
+ return sbmr(r, 21, 20); /* BOOT_CFG3[5:4] */
+}
+
static bool imx53_bootsource_nand(uint32_t r)
{
return BOOT_CFG1(r, 7);
}
+static enum bootsource imx53_bootsource_serial_rom(uint32_t r)
+{
+ return BOOT_CFG1(r, 3) ? BOOTSOURCE_SPI : BOOTSOURCE_I2C;
+}
+
void imx53_get_boot_source(enum bootsource *src, int *instance)
{
void __iomem *src_base = IOMEM(MX53_SRC_BASE_ADDR);
uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR);
- if (imx53_get_bmod(cfg1) == 0x3) {
+ if (imx53_get_bmod(cfg1) == IMX53_BMOD_SERIAL) {
*src = BOOTSOURCE_USB;
*instance = 0;
return;
@@ -208,10 +219,7 @@ void imx53_get_boot_source(enum bootsource *src, int *instance)
*src = BOOTSOURCE_HD;
break;
case 3:
- if (cfg1 & (1 << 3))
- *src = BOOTSOURCE_SPI;
- else
- *src = BOOTSOURCE_I2C;
+ *src = imx53_bootsource_serial_rom(cfg1);
break;
case 4:
case 5:
@@ -229,7 +237,7 @@ void imx53_get_boot_source(enum bootsource *src, int *instance)
case BOOTSOURCE_MMC:
case BOOTSOURCE_SPI:
case BOOTSOURCE_I2C:
- *instance = (cfg1 >> 20) & 0x3;
+ *instance = imx53_port_select(cfg1);
break;
default:
*instance = 0;
--
2.14.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev 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 ` Andrey Smirnov [this message]
2018-04-14 17:50 ` [PATCH 13/17] ARM: i.MX6: boot: Move magic numbers into utility functions Andrey Smirnov
2018-04-14 17:51 ` [PATCH 14/17] ARM: i.MX7: " Andrey Smirnov
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-13-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