dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'rockchip-for-v2019.07-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip

Browse Source 
- rk3399 sdhci driver fixup
- TPL BANNER fixup
This commit is contained in:
Tom Rini
2019-07-23 09:48:16 -04:00
parent 79ea03b38a 89e3917230
commit 9565bd7c6f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-rockchip/tpl.c
View File

@@ -44,7 +44,7 @@ void board_init_f(ulong dummy)
struct udevice *dev; struct udevice *dev;
int ret; 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: * Debug UART can be used from here if required:
* *
@@ -54,8 +54,10 @@ void board_init_f(ulong dummy)
* printascii("string"); * printascii("string");
*/ */
debug_uart_init(); debug_uart_init();
#ifdef CONFIG_TPL_BANNER_PRINT
printascii("\nU-Boot TPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \ printascii("\nU-Boot TPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
U_BOOT_TIME ")\n"); U_BOOT_TIME ")\n");
#endif
#endif #endif
ret = spl_early_init(); ret = spl_early_init();
if (ret) { if (ret) {

8
drivers/mmc/rockchip_sdhci.c
View File

@@ -68,15 +68,15 @@ static int arasan_sdhci_probe(struct udevice *dev)
if (host->bus_width == 8) if (host->bus_width == 8)
host->host_caps |= MMC_MODE_8BIT; host->host_caps |= MMC_MODE_8BIT;
ret = sdhci_setup_cfg(&plat->cfg, host, 0, EMMC_MIN_FREQ);
host->mmc = &plat->mmc; host->mmc = &plat->mmc;
if (ret)
return ret;
host->mmc->priv = &prv->host; host->mmc->priv = &prv->host;
host->mmc->dev = dev; host->mmc->dev = dev;
upriv->mmc = host->mmc; upriv->mmc = host->mmc;
ret = sdhci_setup_cfg(&plat->cfg, host, 0, EMMC_MIN_FREQ);
if (ret)
return ret;
return sdhci_probe(dev); return sdhci_probe(dev);
} }