projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mx53loco
/
mx53loco.c
diff --git
a/board/freescale/mx53loco/mx53loco.c
b/board/freescale/mx53loco/mx53loco.c
index
ae7eca8
..
08dd66f
100644
(file)
--- a/
board/freescale/mx53loco/mx53loco.c
+++ b/
board/freescale/mx53loco/mx53loco.c
@@
-258,7
+258,7
@@
static int power_init(void)
}
if (!i2c_probe(CONFIG_SYS_FSL_PMIC_I2C_ADDR)) {
}
if (!i2c_probe(CONFIG_SYS_FSL_PMIC_I2C_ADDR)) {
- ret = pmic_init(I2C_
PMIC
);
+ ret = pmic_init(I2C_
0
);
if (ret)
return ret;
if (ret)
return ret;
@@
-343,6
+343,7
@@
int board_early_init_f(void)
return 0;
}
return 0;
}
+#if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo(void)
{
u32 cpurev;
int print_cpuinfo(void)
{
u32 cpurev;
@@
-356,6
+357,7
@@
int print_cpuinfo(void)
printf("Reset cause: %s\n", get_reset_cause());
return 0;
}
printf("Reset cause: %s\n", get_reset_cause());
return 0;
}
+#endif
/*
* Do not overwrite the console
/*
* Do not overwrite the console