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 a649697257a8e6c61e479f68b8823e7e0cc104ad..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
  *
@@ -6,8 +7,6 @@
  * Based on logicpd/am3517evm/am3517evm.c
  *
  * Copyright (C) 2011 Mistral Solutions Pvt Ltd
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -43,11 +42,11 @@ int board_init(void)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_SYS_I2C_OMAP34XX
+#ifdef CONFIG_SYS_I2C_OMAP24XX
        i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
-       dieid_num_r();
+       omap_die_id_display();
 
        return 0;
 }
@@ -63,7 +62,7 @@ void set_muxconf_regs(void)
        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);