diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-23 09:48:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-23 09:48:16 -0400 |
| commit | 9565bd7c6f4241af746fd67ee5c8406a99c148b3 (patch) | |
| tree | c31be6d08ea72efde423a1cde4483493eb9d3a18 | |
| parent | 79ea03b38a8e9a4488473b5ee57f3fab8d360f17 (diff) | |
| parent | 89e39172301f15b29f663baf704bf2163a0cfa46 (diff) | |
| download | u-boot-9565bd7c6f4241af746fd67ee5c8406a99c148b3.tar.gz | |
Merge tag 'rockchip-for-v2019.07-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- rk3399 sdhci driver fixup
- TPL BANNER fixup
| -rw-r--r-- | arch/arm/mach-rockchip/tpl.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/rockchip_sdhci.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index 0ff2a197ed..55f6e922d0 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -44,7 +44,7 @@ void board_init_f(ulong dummy) struct udevice *dev; int ret; -#ifdef CONFIG_DEBUG_UART +#if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT) /* * Debug UART can be used from here if required: * @@ -54,9 +54,11 @@ void board_init_f(ulong dummy) * printascii("string"); */ debug_uart_init(); +#ifdef CONFIG_TPL_BANNER_PRINT printascii("\nU-Boot TPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \ U_BOOT_TIME ")\n"); #endif +#endif ret = spl_early_init(); if (ret) { debug("spl_early_init() failed: %d\n", ret); diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index cb623d589b..dd3d5574db 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -68,15 +68,15 @@ static int arasan_sdhci_probe(struct udevice *dev) if (host->bus_width == 8) host->host_caps |= MMC_MODE_8BIT; - ret = sdhci_setup_cfg(&plat->cfg, host, 0, EMMC_MIN_FREQ); - host->mmc = &plat->mmc; - if (ret) - return ret; host->mmc->priv = &prv->host; host->mmc->dev = dev; upriv->mmc = host->mmc; + ret = sdhci_setup_cfg(&plat->cfg, host, 0, EMMC_MIN_FREQ); + if (ret) + return ret; + return sdhci_probe(dev); } |