diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-16 12:31:42 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-17 09:13:05 +0200 |
| commit | d84beaa14a4a78000c025c02dc4e157a8b63ad07 (patch) | |
| tree | c466a42feffd14dbbe37a980ad9e33f81289e99f | |
| parent | 90a964da12a866c60ba891efe5be8ae31d0aa399 (diff) | |
| download | barebox-d84beaa14a4a78000c025c02dc4e157a8b63ad07.tar.gz barebox-d84beaa14a4a78000c025c02dc4e157a8b63ad07.tar.xz | |
ARM: i.MX: Add a function to extract BMOD value
The location of BMDO field in SBMR/SBMR2 registers is consistent
across all i.MX SoCs starting from i.MX53. Add simple helper function
imx53_get_bmod and use it to avoid code duplication.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/boot.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 72597f5e2d..96bc2ec941 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -15,6 +15,7 @@ #include <bootsource.h> #include <environment.h> #include <init.h> +#include <linux/bitfield.h> #include <magicvar.h> #include <io.h> @@ -213,12 +214,19 @@ void imx51_boot_save_loc(void) } #define IMX53_SRC_SBMR 0x4 +#define SRC_SBMR_BMOD GENMASK(25, 24) + +static unsigned int imx53_get_bmod(uint32_t r) +{ + return FIELD_GET(SRC_SBMR_BMOD, r); +} + 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 (((cfg1 >> 24) & 0x3) == 0x3) { + if (imx53_get_bmod(cfg1) == 0x3) { *src = BOOTSOURCE_USB; *instance = 0; return; @@ -280,12 +288,8 @@ void imx6_get_boot_source(enum bootsource *src, int *instance) uint32_t sbmr1 = readl(src_base + IMX6_SRC_SBMR1); uint32_t sbmr2 = readl(src_base + IMX6_SRC_SBMR2); uint32_t boot_cfg_4_2_0; - int boot_mode; - - /* BMOD[1:0] */ - boot_mode = (sbmr2 >> 24) & 0x3; - switch (boot_mode) { + switch (imx53_get_bmod(sbmr2)) { case 0: /* Fuses, fall through */ case 2: /* internal boot */ goto internal_boot; @@ -356,12 +360,8 @@ void imx7_get_boot_source(enum bootsource *src, int *instance) void __iomem *src_base = IOMEM(MX7_SRC_BASE_ADDR); uint32_t sbmr1 = readl(src_base + IMX7_SRC_SBMR1); uint32_t sbmr2 = readl(src_base + IMX7_SRC_SBMR2); - int boot_mode; - - /* BMOD[1:0] */ - boot_mode = (sbmr2 >> 24) & 0x3; - switch (boot_mode) { + switch (imx53_get_bmod(sbmr2)) { case 0: /* Fuses, fall through */ case 2: /* internal boot */ goto internal_boot; |