env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr()

[u-boot] / board / BuR / common / common.c

diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index e947e54c39f86db03a2147bb9820f062aa9bdaec..eb34de931ec3ee36f84f0cf992c41f6725bfb58f 100644 (file)
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -184,7 +184,7 @@ int load_lcdtiming(struct am335x_lcdpanel *panel)
                puts("no 'factory-settings / rotation' in dtb!\n");
        }
        snprintf(buf, sizeof(buf), "fbcon=rotate:%d", panel_info.vl_rot);
-       setenv("optargs_rot", buf);
+       env_set("optargs_rot", buf);
 #else
        pnltmp.hactive = getenv_ulong("ds1_hactive", 10, ~0UL);
        pnltmp.vactive = getenv_ulong("ds1_vactive", 10, ~0UL);
@@ -259,18 +259,19 @@ static int load_devicetree(void)
        }
 #ifdef CONFIG_NAND
        dtbsize = 0x20000;
-       rc = nand_read_skip_bad(nand_info[0], 0x40000, (size_t *)&dtbsize,
+       rc = nand_read_skip_bad(get_nand_dev_by_index(0), 0x40000,
+                               (size_t *)&dtbsize,
                                NULL, 0x20000, (u_char *)dtbaddr);
 #else
        char *dtbname = getenv("dtb");
        char *dtbdev = getenv("dtbdev");
-       char *dtppart = getenv("dtbpart");
-       if (!dtbdev || !dtbdev || !dtbname) {
+       char *dtbpart = getenv("dtbpart");
+       if (!dtbdev || !dtbpart || !dtbname) {
                printf("%s: <dtbdev>/<dtbpart>/<dtb> missing.\n", __func__);
                return -1;
        }
 
-       if (fs_set_blk_dev(dtbdev, dtppart, FS_TYPE_EXT)) {
+       if (fs_set_blk_dev(dtbdev, dtbpart, FS_TYPE_EXT)) {
                puts("load_devicetree: set_blk_dev failed.\n");
                return -1;
        }
@@ -669,7 +670,7 @@ int board_eth_init(bd_t *bis)
 
                if (mac) {
                        printf("using: %pM on ", mac);
-                       eth_setenv_enetaddr("ethaddr", (const u8 *)mac);
+                       eth_env_set_enetaddr("ethaddr", (const u8 *)mac);
                }
        }
        writel(MII_MODE_ENABLE, &cdev->miisel);
@@ -684,10 +685,15 @@ int board_eth_init(bd_t *bis)
        return rv;
 }
 #endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */
-#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_MMC)
 int board_mmc_init(bd_t *bis)
 {
-       return omap_mmc_init(1, 0, 0, -1, -1);
+       int rc = 0;
+
+       rc |= omap_mmc_init(0, 0, 0, -1, -1);
+       rc |= omap_mmc_init(1, 0, 0, -1, -1);
+
+       return rc;
 }
 #endif
 int overwrite_console(void)