LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Tom Rini 2014-09-23 15:21:43 -04:00
parent 692c223518 cae025aab3
commit 47d3debe1a
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -3849,12 +3849,9 @@ Configuration Settings:
The memory will be freed (or in fact just forgotton) when The memory will be freed (or in fact just forgotton) when
U-Boot relocates itself. U-Boot relocates itself.
Pre-relocation malloc() is only supported on sandbox Pre-relocation malloc() is only supported on ARM and sandbox
at present but is fairly easy to enable for other archs. at present but is fairly easy to enable for other archs.
Pre-relocation malloc() is only supported on ARM at present
but is fairly easy to enable for other archs.
- CONFIG_SYS_BOOTM_LEN: - CONFIG_SYS_BOOTM_LEN:
Normally compressed uImages are limited to an Normally compressed uImages are limited to an
uncompressed size of 8 MBytes. If this is not enough, uncompressed size of 8 MBytes. If this is not enough,

9
drivers/core/device.c
View File

@ -106,13 +106,18 @@ int device_bind(struct udevice *parent, struct driver *drv, const char *name,
* a 'requested' sequence, and will be resolved (and ->seq updated) * a 'requested' sequence, and will be resolved (and ->seq updated)
* when the device is probed. * when the device is probed.
*/ */
dev->req_seq = fdtdec_get_int(gd->fdt_blob, of_offset, "reg", -1);
dev->seq = -1; dev->seq = -1;
#ifdef CONFIG_OF_CONTROL
dev->req_seq = fdtdec_get_int(gd->fdt_blob, of_offset, "reg", -1);
if (!IS_ERR_VALUE(dev->req_seq))
dev->req_seq &= INT_MAX;
if (uc->uc_drv->name && of_offset != -1) { if (uc->uc_drv->name && of_offset != -1) {
fdtdec_get_alias_seq(gd->fdt_blob, uc->uc_drv->name, of_offset, fdtdec_get_alias_seq(gd->fdt_blob, uc->uc_drv->name, of_offset,
&dev->req_seq); &dev->req_seq);
} }
#else
dev->req_seq = -1;
#endif
if (!dev->platdata && drv->platdata_auto_alloc_size) if (!dev->platdata && drv->platdata_auto_alloc_size)
dev->flags |= DM_FLAG_ALLOC_PDATA; dev->flags |= DM_FLAG_ALLOC_PDATA;

1
drivers/mtd/spi/sf_params.c
View File

@ -116,6 +116,7 @@ const struct spi_flash_params spi_flash_params_table[] = {
{"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, RD_FULL, WR_QPP | SECT_4K}, {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, RD_FULL, WR_QPP | SECT_4K},
{"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, RD_FULL, WR_QPP | SECT_4K}, {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, RD_FULL, WR_QPP | SECT_4K},
#endif #endif
{}, /* Empty entry to terminate the list */
/* /*
* Note: * Note:
* Below paired flash devices has similar spi_flash params. * Below paired flash devices has similar spi_flash params.

3
drivers/serial/serial-uclass.c
View File

@ -25,6 +25,7 @@ struct udevice *cur_dev __attribute__ ((section(".data")));
static void serial_find_console_or_panic(void) static void serial_find_console_or_panic(void)
{ {
#ifdef CONFIG_OF_CONTROL
int node; int node;
/* Check for a chosen console */ /* Check for a chosen console */
@ -44,7 +45,7 @@ static void serial_find_console_or_panic(void)
return; return;
cur_dev = NULL; cur_dev = NULL;
} }
#endif
/* /*
* Failing that, get the device with sequence number 0, or in extremis * Failing that, get the device with sequence number 0, or in extremis
* just the first serial device we can find. But we insist on having * just the first serial device we can find. But we insist on having