From: Tom Rini <trini@ti.com>
Date: Mon, 24 Nov 2014 17:01:48 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-dm
X-Git-Tag: v2015.01-rc2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1739564e753bc3a8097f8937a3cbe738bdaaed5d;p=oweals%2Fu-boot.git

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

Conflicts:
	drivers/serial/serial-uclass.c

Signed-off-by: Tom Rini <trini@ti.com>
---

1739564e753bc3a8097f8937a3cbe738bdaaed5d
diff --cc drivers/serial/serial-uclass.c
index 0f019c8f50,cd5324cfa3..b09053f140
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@@ -19,6 -20,14 +20,11 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
 -/* The currently-selected console serial device */
 -struct udevice *cur_dev __attribute__ ((section(".data")));
 -
+ /*
+  * Table with supported baudrates (defined in config_xyz.h)
+  */
+ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
+ 
  #ifndef CONFIG_SYS_MALLOC_F_LEN
  #error "Serial is required before relocation - define CONFIG_SYS_MALLOC_F_LEN to make this work"
  #endif