Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / board / BuR / common / common.c

diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index ce4acc1..e8c6401 100644 (file)
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -259,18 +259,18 @@ 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(nand_info[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;
        }
@@ -684,10 +684,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)