Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/serial/serial_lpuart.c
index b0c6f6f4ab244ab8f4f70986c7081d1fdf208cae,0a5e15919f63a60984bf7bf6274be498de7de097..63fc388b264feef2497601d2dc010bda975e9a72
--- 1/drivers/serial/serial_lpuart.c
--- 2/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@@ -14,32 -14,14 +14,37 @@@
  
  #define US1_TDRE        (1 << 7)
  #define US1_RDRF        (1 << 5)
+ #define US1_OR          (1 << 3)
  #define UC2_TE          (1 << 3)
  #define UC2_RE          (1 << 2)
+ #define CFIFO_TXFLUSH   (1 << 7)
+ #define CFIFO_RXFLUSH   (1 << 6)
+ #define SFIFO_RXOF      (1 << 2)
+ #define SFIFO_RXUF      (1 << 0)
  
 +#define STAT_LBKDIF   (1 << 31)
 +#define STAT_RXEDGIF  (1 << 30)
 +#define STAT_TDRE     (1 << 23)
 +#define STAT_RDRF     (1 << 21)
 +#define STAT_IDLE     (1 << 20)
 +#define STAT_OR               (1 << 19)
 +#define STAT_NF               (1 << 18)
 +#define STAT_FE               (1 << 17)
 +#define STAT_PF               (1 << 16)
 +#define STAT_MA1F     (1 << 15)
 +#define STAT_MA2F     (1 << 14)
 +#define STAT_FLAGS    (STAT_LBKDIF | STAT_RXEDGIF | STAT_IDLE | STAT_OR | \
 +                      STAT_NF | STAT_FE | STAT_PF | STAT_MA1F | STAT_MA2F)
 +
 +#define CTRL_TE               (1 << 19)
 +#define CTRL_RE               (1 << 18)
 +
 +#define FIFO_TXFE             0x80
 +#define FIFO_RXFE             0x40
 +
 +#define WATER_TXWATER_OFF     1
 +#define WATER_RXWATER_OFF     16
 +
  DECLARE_GLOBAL_DATA_PTR;
  
  struct lpuart_fsl *base = (struct lpuart_fsl *)LPUART_BASE;