sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

imx6: Add imx6_src_get_boot_mode 

For i.MX6, the bootmode determine code is part of spl_boot_device,
but there is might be a possibility for other part the code need to
check the desired boot mode for adding new functionalities like
modeboot env variable, or changing boot order etc.

So introduced imx6_src_get_boot_mode which actually reading the
boot mode register for desired modes.

More cleanup will be add in future patches.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@openedev.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Jagan Teki 2017-02-24 15:45:12 +05:30 committed by Stefano Babic
parent c37093f399
commit cba586b400
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/imx-common/init.c
View File

@ -115,3 +115,15 @@ void boot_mode_apply(unsigned cfg_val)
writel(reg, &psrc->gpr10);
}
#endif
#if defined(CONFIG_MX6)
u32 imx6_src_get_boot_mode(void)
{
struct src *psrc = (struct src *)SRC_BASE_ADDR;
if (imx6_is_bmode_from_gpr9())
return readl(&psrc->gpr9);
else
return readl(&psrc->sbmr1);
}
#endif

4
arch/arm/imx-common/spl.c
View File

@ -10,6 +10,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
#include <asm/spl.h>
#include <spl.h>
#include <asm/imx-common/hab.h>
@ -19,9 +20,8 @@
u32 spl_boot_device(void)
{
struct src *psrc = (struct src *)SRC_BASE_ADDR;
unsigned int gpr10_boot = readl(&psrc->gpr10) & (1 << 28);
unsigned reg = gpr10_boot ? readl(&psrc->gpr9) : readl(&psrc->sbmr1);
unsigned int bmode = readl(&psrc->sbmr2);
u32 reg = imx6_src_get_boot_mode();
/*
* Check for BMODE if serial downloader is enabled

14
arch/arm/include/asm/imx-common/sys_proto.h
View File

@ -8,6 +8,7 @@
#ifndef _SYS_PROTO_H_
#define _SYS_PROTO_H_
#include <asm/io.h>
#include <asm/imx-common/regs-common.h>
#include <common.h>
#include "../arch-imx/cpu.h"
@ -40,6 +41,19 @@
#define is_mx7ulp() (is_cpu_type(MXC_CPU_MX7ULP))
#ifdef CONFIG_MX6
#define IMX6_SRC_GPR10_BMODE BIT(28)
static inline u8 imx6_is_bmode_from_gpr9(void)
{
struct src *psrc = (struct src *)SRC_BASE_ADDR;
return readl(&psrc->gpr10) & IMX6_SRC_GPR10_BMODE;
}
u32 imx6_src_get_boot_mode(void);
#endif /* CONFIG_MX6 */
u32 get_nr_cpus(void);
u32 get_cpu_rev(void);
u32 get_cpu_speed_grade_hz(void);