diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-01 13:36:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-22 11:20:52 +0200 |
| commit | cf3dfafff4cb992a11552953d019ab6a20e5aead (patch) | |
| tree | 974963d06493f0b38bd0e0ffe81d42bb252879f4 /arch/arm/mach-imx/boot.c | |
| parent | 712a7de9b420228717be40fe9a2d4ec5e38b797f (diff) | |
| download | barebox-cf3dfafff4cb992a11552953d019ab6a20e5aead.tar.gz barebox-cf3dfafff4cb992a11552953d019ab6a20e5aead.tar.xz | |
ARM: i.MX53: do not pass base address to imx*_boot_save_loc
The functions can determine the necessary base addresses
themselves since they are SoC specific anyway.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/boot.c')
| -rw-r--r-- | arch/arm/mach-imx/boot.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 376e370cf9..f6c546d208 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -20,7 +20,10 @@ #include <io.h> #include <mach/generic.h> #include <mach/imx25-regs.h> +#include <mach/imx27-regs.h> #include <mach/imx35-regs.h> +#include <mach/imx51-regs.h> +#include <mach/imx53-regs.h> #include <mach/imx6-regs.h> /* [CTRL][TYPE] */ @@ -75,8 +78,9 @@ static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type) bootsource_set(src); } -void imx25_boot_save_loc(void __iomem *ccm_base) +void imx25_boot_save_loc(void) { + void __iomem *ccm_base = IOMEM(MX25_CCM_BASE_ADDR); uint32_t val; val = readl(ccm_base + MX25_CCM_RCSR); @@ -84,8 +88,9 @@ void imx25_boot_save_loc(void __iomem *ccm_base) (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3); } -void imx35_boot_save_loc(void __iomem *ccm_base) +void imx35_boot_save_loc(void) { + void __iomem *ccm_base = IOMEM(MX35_CCM_BASE_ADDR); uint32_t val; val = readl(ccm_base + MX35_CCM_RCSR); @@ -104,8 +109,9 @@ void imx35_boot_save_loc(void __iomem *ccm_base) #define IMX27_GPCR_BOOT_32BIT_CS0 6 #define IMX27_GPCR_BOOT_8BIT_NAND_512 7 -void imx27_boot_save_loc(void __iomem *sysctrl_base) +void imx27_boot_save_loc(void) { + void __iomem *sysctrl_base = IOMEM(MX27_SYSCTRL_BASE_ADDR); enum bootsource src; uint32_t val; @@ -136,8 +142,9 @@ void imx27_boot_save_loc(void __iomem *sysctrl_base) #define IMX51_SBMR_BT_MEM_CTL_SHIFT 0 #define IMX51_SBMR_BMOD_SHIFT 14 -void imx51_boot_save_loc(void __iomem *src_base) +void imx51_boot_save_loc(void) { + void __iomem *src_base = IOMEM(MX51_SRC_BASE_ADDR); enum bootsource src = BOOTSOURCE_UNKNOWN; uint32_t reg; unsigned int ctrl, type; @@ -167,8 +174,9 @@ void imx51_boot_save_loc(void __iomem *src_base) } #define IMX53_SRC_SBMR 0x4 -void imx53_boot_save_loc(void __iomem *src_base) +void imx53_boot_save_loc(void) { + void __iomem *src_base = IOMEM(MX53_SRC_BASE_ADDR); enum bootsource src = BOOTSOURCE_UNKNOWN; int instance; uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR); @@ -278,7 +286,7 @@ internal_boot: return; } -void imx6_boot_save_loc(void __iomem *src_base) +void imx6_boot_save_loc(void) { enum bootsource src = BOOTSOURCE_UNKNOWN; int instance = BOOTSOURCE_INSTANCE_UNKNOWN; |