diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-16 12:31:49 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-17 09:13:06 +0200 |
| commit | 779ca14034e7b04c1314fbd2515edc5fbaee56a8 (patch) | |
| tree | ce1afc0feab247f620035063df14e406997adcac /arch | |
| parent | eb0f1576386b2143d33079a351df87d325c64320 (diff) | |
| download | barebox-779ca14034e7b04c1314fbd2515edc5fbaee56a8.tar.gz barebox-779ca14034e7b04c1314fbd2515edc5fbaee56a8.tar.xz | |
ARM: i.MX: boot: Move magic values into small functions
Move code to extract appropiate BOOT_CFG bits to decode bootsource on
i.MX53, 6, and 7 into small functions for clarity and to allow sharing
the code between i.MX53 and i.MX6.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/boot.c | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 622948716b..1a03367e16 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -216,11 +216,38 @@ void imx51_boot_save_loc(void) #define IMX53_SRC_SBMR 0x4 #define SRC_SBMR_BMOD GENMASK(25, 24) +#define __BOOT_CFG(n, m, l) GENMASK((m) + ((n) - 1) * 8, \ + (l) + ((n) - 1) * 8) +#define BOOT_CFG1(m, l) __BOOT_CFG(1, m, l) + +#define ___BOOT_CFG(n, i) __BOOT_CFG(n, i, i) +#define __MAKE_BOOT_CFG_BITS(idx) \ + enum { \ + BOOT_CFG##idx##_0 = ___BOOT_CFG(idx, 0), \ + BOOT_CFG##idx##_1 = ___BOOT_CFG(idx, 1), \ + BOOT_CFG##idx##_2 = ___BOOT_CFG(idx, 2), \ + BOOT_CFG##idx##_3 = ___BOOT_CFG(idx, 3), \ + BOOT_CFG##idx##_4 = ___BOOT_CFG(idx, 4), \ + BOOT_CFG##idx##_5 = ___BOOT_CFG(idx, 5), \ + BOOT_CFG##idx##_6 = ___BOOT_CFG(idx, 6), \ + BOOT_CFG##idx##_7 = ___BOOT_CFG(idx, 7), \ + }; + +__MAKE_BOOT_CFG_BITS(1) +#undef __MAKE_BOOT_CFG +#undef ___BOOT_CFG + + static unsigned int imx53_get_bmod(uint32_t r) { return FIELD_GET(SRC_SBMR_BMOD, r); } +static int imx53_bootsource_internal(uint32_t r) +{ + return FIELD_GET(BOOT_CFG1(7, 4), r); +} + void imx53_get_boot_source(enum bootsource *src, int *instance) { void __iomem *src_base = IOMEM(MX53_SRC_BASE_ADDR); @@ -232,7 +259,7 @@ void imx53_get_boot_source(enum bootsource *src, int *instance) return; } - switch ((cfg1 & 0xff) >> 4) { + switch (imx53_bootsource_internal(cfg1)) { case 2: *src = BOOTSOURCE_HD; break; @@ -318,8 +345,7 @@ void imx6_get_boot_source(enum bootsource *src, int *instance) return; } - /* BOOT_CFG1[7:4] */ - switch ((sbmr1 >> 4) & 0xf) { + switch (imx53_bootsource_internal(sbmr1)) { case 2: *src = BOOTSOURCE_HD; break; @@ -367,9 +393,19 @@ void imx6_boot_save_loc(void) #define IMX7_SRC_SBMR1 0x58 #define IMX7_SRC_SBMR2 0x70 +/* + * Re-defined to match the naming in reference manual + */ +#define BOOT_CFG(m, l) BOOT_CFG1(m, l) + #define IMX_BOOT_SW_INFO_POINTER_ADDR 0x000001E8 #define IMX_BOOT_SW_INFO_BDT_SD 0x1 +static unsigned int imx7_bootsource_internal(uint32_t r) +{ + return FIELD_GET(BOOT_CFG(15, 12), r); +} + struct imx_boot_sw_info { uint8_t reserved_1; uint8_t boot_device_instance; @@ -421,7 +457,7 @@ void imx7_get_boot_source(enum bootsource *src, int *instance) return; } - switch ((sbmr1 >> 12) & 0xf) { + switch (imx7_bootsource_internal(sbmr1)) { case 1: case 2: *src = BOOTSOURCE_MMC; |