projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mx6: thermal: Check cpu temperature via thermal sensor
[oweals/u-boot.git]
/
arch
/
arm
/
imx-common
/
spl.c
diff --git
a/arch/arm/imx-common/spl.c
b/arch/arm/imx-common/spl.c
index 9d3c31ab089a325a38146debb67021f36a4cdd53..477c38c1e20bc8a111f8310f16ff7e42d85c0214 100644
(file)
--- 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)
#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;
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) {
/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
switch ((reg & 0x000000FF) >> 4) {