mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-16 10:01:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-rockchip

Browse Source
This commit is contained in:
Tom Rini 2016-01-15 08:11:15 -05:00
commit 782acf7b52
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -109,6 +109,12 @@ T: git git://git.denx.de/u-boot-pxa.git
F: arch/arm/cpu/pxa/ F: arch/arm/cpu/pxa/
F: arch/arm/include/asm/arch-pxa/ F: arch/arm/include/asm/arch-pxa/
ARM ROCKCHIP
M: Simon Glass <sjg@chromium.org>
S: Maintained
T: git git://git.denx.de/u-boot-rockchip.git
F: arch/arm/mach-rockchip/
ARM SAMSUNG ARM SAMSUNG
M: Minkyu Kang <mk7.kang@samsung.com> M: Minkyu Kang <mk7.kang@samsung.com>
S: Maintained S: Maintained

2
drivers/mmc/rockchip_dw_mmc.c
View File

@ -52,6 +52,8 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
/* use non-removeable as sdcard and emmc as judgement */ /* use non-removeable as sdcard and emmc as judgement */
if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "non-removable")) if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "non-removable"))
host->dev_index = 0;
else
host->dev_index = 1; host->dev_index = 1;
return 0; return 0;

8
drivers/mtd/spi/sf-uclass.c
View File

@ -55,11 +55,17 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
{ {
struct spi_slave *slave; struct spi_slave *slave;
struct udevice *bus; struct udevice *bus;
char name[30], *str; char *str;
int ret; int ret;
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF)
str = "spi_flash";
#else
char name[30];
snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs); snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
str = strdup(name); str = strdup(name);
#endif
ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode, ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
"spi_flash_std", str, &bus, &slave); "spi_flash_std", str, &bus, &slave);
if (ret) if (ret)