projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
board
/
ti
/
am3517crane
/
am3517crane.c
diff --git
a/board/ti/am3517crane/am3517crane.c
b/board/ti/am3517crane/am3517crane.c
index a649697257a8e6c61e479f68b8823e7e0cc104ad..5fa319d6152b64f5b9ec8f3b25108d3746d68704 100644
(file)
--- a/
board/ti/am3517crane/am3517crane.c
+++ b/
board/ti/am3517crane/am3517crane.c
@@
-47,7
+47,7
@@
int misc_init_r(void)
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif
-
dieid_num_r
();
+
omap_die_id_display
();
return 0;
}
return 0;
}
@@
-63,7
+63,7
@@
void set_muxconf_regs(void)
MUX_AM3517CRANE();
}
MUX_AM3517CRANE();
}
-#if defined(CONFIG_
GENERIC_MMC) && !defined(CONFIG_SPL_BUILD
)
+#if defined(CONFIG_
MMC
)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);