summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Petermaier <oe5hpm@oevsv.at>2014-04-08 08:39:20 +0200
committerPantelis Antoniou <panto@antoniou-consulting.com>2014-05-23 11:15:53 +0300
commit46c8ebc8cddb81e879d08030f030eca53b123ca9 (patch)
tree0172052dca88246af8e39255ede7901aef0e86ab
parent716897760fe41c350f55564a73d2e58dafd1ee53 (diff)
downloadu-boot-imx-46c8ebc8cddb81e879d08030f030eca53b123ca9.zip
u-boot-imx-46c8ebc8cddb81e879d08030f030eca53b123ca9.tar.gz
u-boot-imx-46c8ebc8cddb81e879d08030f030eca53b123ca9.tar.bz2
Add board_mmc_init(...) function for init mmc1 only
Since B&R boards uses only MMC-Controller #1, it only wastes time if we initialize #0 first to see that there is nothing. Cc: <trini@ti.com> Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
-rw-r--r--board/BuR/common/common.c7
-rw-r--r--include/configs/kwb.h2
-rw-r--r--include/configs/tseries.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 4c926ce..25cbe62 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -19,6 +19,7 @@
#include <asm/arch/clock.h>
#include <asm/arch/gpio.h>
#include <asm/arch/sys_proto.h>
+#include <asm/arch/mmc_host_def.h>
#include <asm/io.h>
#include <asm/gpio.h>
#include <i2c.h>
@@ -214,3 +215,9 @@ int board_eth_init(bd_t *bis)
return rv;
}
#endif /* CONFIG_DRIVER_TI_CPSW */
+#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
+int board_mmc_init(bd_t *bis)
+{
+ return omap_mmc_init(1, 0, 0, -1, -1);
+}
+#endif
diff --git a/include/configs/kwb.h b/include/configs/kwb.h
index 0f631c0..0860434 100644
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -109,7 +109,7 @@
#undef CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV 1
+#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index 8fb87ac..e550afa 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -237,7 +237,7 @@
#elif defined(CONFIG_EMMC_BOOT)
#undef CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV 1
+#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)