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-sunxi
[oweals/u-boot.git]
/
board
/
ti
/
am3517crane
/
am3517crane.c
diff --git
a/board/ti/am3517crane/am3517crane.c
b/board/ti/am3517crane/am3517crane.c
index 8d1c390e5d02eaaf24720dd8e4005319610c4475..5d4e57ffc5c2015f21d07abccc3d7473c6e2c959 100644
(file)
--- a/
board/ti/am3517crane/am3517crane.c
+++ b/
board/ti/am3517crane/am3517crane.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* am3517crane.c - board file for AM3517 CraneBoard
*
/*
* am3517crane.c - board file for AM3517 CraneBoard
*
@@
-6,8
+7,6
@@
* Based on logicpd/am3517evm/am3517evm.c
*
* Copyright (C) 2011 Mistral Solutions Pvt Ltd
* Based on logicpd/am3517evm/am3517evm.c
*
* Copyright (C) 2011 Mistral Solutions Pvt Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-43,7
+42,7
@@
int board_init(void)
*/
int misc_init_r(void)
{
*/
int misc_init_r(void)
{
-#ifdef CONFIG_SYS_I2C_OMAP
3
4XX
+#ifdef CONFIG_SYS_I2C_OMAP
2
4XX
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
@@
-63,7
+62,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);