diff options
| author | Tom Rini <trini@ti.com> | 2014-09-23 15:21:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-23 15:21:43 -0400 |
| commit | 47d3debe1ab8315dc9ade22279e02f60eceda25b (patch) | |
| tree | 705c9aef9c969074339484a9a5adaa3f8ca43fcd | |
| parent | 692c223518023b47579fbf1142a8f639cbedb5b0 (diff) | |
| parent | cae025aab3e8ea8ad455cce8b0e4647401cdd091 (diff) | |
| download | talos-obmc-uboot-47d3debe1ab8315dc9ade22279e02f60eceda25b.tar.gz talos-obmc-uboot-47d3debe1ab8315dc9ade22279e02f60eceda25b.zip | |
Merge git://git.denx.de/u-boot-dm
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | drivers/core/device.c | 9 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf_params.c | 1 | ||||
| -rw-r--r-- | drivers/serial/serial-uclass.c | 3 |
4 files changed, 11 insertions, 7 deletions
@@ -3849,12 +3849,9 @@ Configuration Settings: The memory will be freed (or in fact just forgotton) when 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. - Pre-relocation malloc() is only supported on ARM at present - but is fairly easy to enable for other archs. - - CONFIG_SYS_BOOTM_LEN: Normally compressed uImages are limited to an uncompressed size of 8 MBytes. If this is not enough, diff --git a/drivers/core/device.c b/drivers/core/device.c index 166b0732ab..32e80e82b5 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -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) * when the device is probed. */ - dev->req_seq = fdtdec_get_int(gd->fdt_blob, of_offset, "reg", -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) { fdtdec_get_alias_seq(gd->fdt_blob, uc->uc_drv->name, of_offset, &dev->req_seq); } - +#else + dev->req_seq = -1; +#endif if (!dev->platdata && drv->platdata_auto_alloc_size) dev->flags |= DM_FLAG_ALLOC_PDATA; diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c index ac886fd071..856eb4cfbe 100644 --- a/drivers/mtd/spi/sf_params.c +++ b/drivers/mtd/spi/sf_params.c @@ -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}, {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, RD_FULL, WR_QPP | SECT_4K}, #endif + {}, /* Empty entry to terminate the list */ /* * Note: * Below paired flash devices has similar spi_flash params. diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index d04104e747..1ac943f692 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -25,6 +25,7 @@ struct udevice *cur_dev __attribute__ ((section(".data"))); static void serial_find_console_or_panic(void) { +#ifdef CONFIG_OF_CONTROL int node; /* Check for a chosen console */ @@ -44,7 +45,7 @@ static void serial_find_console_or_panic(void) return; cur_dev = NULL; } - +#endif /* * 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 |
