diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2017-08-28 18:05:10 -0500 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2017-08-28 18:05:10 -0500 |
| commit | 897c50416cb47553fd149ae95ede41149ae8fbaa (patch) | |
| tree | 862d462158291cbd41102d541554304ed42a4eaa /board/BuR/common/common.c | |
| parent | 28c2b55c045daa86413fe9fa73299b1d47564615 (diff) | |
| parent | 50becb1a9d088359a55d6068a47ed3fc8605253c (diff) | |
| download | jacinto6evm-897c50416cb47553fd149ae95ede41149ae8fbaa.tar.gz | |
Merge branch 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot into 6AM.1.3-rvc-video6AM.1.3-rvc-video-j6e-aug6AM.1.3-rvc-video
* 'p-ti-u-boot-2016.05' of git://git.omapzoom.org/repo/u-boot: (62 commits)
am57x: android: add vendor partition
arm: omap: enable high speed mode support in SPL for the eMMC on DRA76x
ARM: dts: dra76-evm: add higher speed MMC/SD modes
ARM: dts: dra76-evm: shift to using common IOdelay data
ARM: dts: dra76x: create a common file with MMC/SD IOdelay data
ARM: DRA72x: Add support for detection of DRA71x SR 2.1
dra7xx: android: add vendor partition
fastboot: sparse: remove session-id logic
ARM: dts: dra76-evm: Add initial support
ARM: dts: dra7-evm: sync DT with Linux
configs: ti_omap5_common: Select dtb name for dra76
board: ti: dra76-evm: Add support for powering on mmc ldo
board: ti: dra76-evm: Add the pinmux data
board: ti: dra76-evm: Add DDR data
board: ti: dra76-evm: Add the pmic data
board: ti: dra76-evm: Add epprom support
arm: dra76: Add support for ES1.0 detection
configs: dra7xx: Enable LP87565 related configs
power: regulator: palmas: Add smps12 dual regulator for tps65917
power: regulator: lp87565: add regulator support
...
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'board/BuR/common/common.c')
| -rw-r--r-- | board/BuR/common/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index ce4acc13e0..677e043797 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -684,7 +684,7 @@ 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_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(1, 0, 0, -1, -1); |