diff options
| author | Tom Rini <trini@ti.com> | 2014-11-14 13:53:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-14 13:53:49 -0500 |
| commit | 45043cf804763d4cf93fec93d8294e385f87622a (patch) | |
| tree | 6f8153477648689f4143c317449891818b78b5e6 /arch/arm/imx-common/spl.c | |
| parent | 0d485b9095328cdc81b2ee94ff59b988c69b9127 (diff) | |
| parent | 05d492a3235df397da6200294ea2a802749372a8 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common/spl.c')
| -rw-r--r-- | arch/arm/imx-common/spl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index 9d3c31ab089..477c38c1e20 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -14,11 +14,12 @@ #include <spl.h> #if defined(CONFIG_MX6) -/* determine boot device from SRC_SBMR1 register (BOOT_CFG[4:1]) */ +/* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device(void) { struct src *psrc = (struct src *)SRC_BASE_ADDR; - unsigned reg = readl(&psrc->sbmr1); + unsigned int gpr10_boot = readl(&psrc->gpr10) & (1 << 28); + unsigned reg = gpr10_boot ? readl(&psrc->gpr9) : readl(&psrc->sbmr1); /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & 0x000000FF) >> 4) { |