Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
	drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.

diff --cc boards.cfg
Simple merge

diff --cc config.mk
Simple merge

diff --cc drivers/serial/serial.c
index 118fbc305ca721ae980f8a6cf22d078d35c9df1c,336ff357211908161f341107d1817ef40ed9400b..35dc61e020c04b5e0efc37df211e28fff8f2a67d
--- 1/drivers/serial/serial.c
--- 2/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@@ -159,7 -159,7 +159,8 @@@ serial_initfunc(pl01x_serial_initialize
  serial_initfunc(s3c44b0_serial_initialize);
  serial_initfunc(sa1100_serial_initialize);
  serial_initfunc(sh_serial_initialize);
 +serial_initfunc(arm_dcc_initialize);
+ serial_initfunc(mxs_auart_initialize);
  
  /**
   * serial_register() - Register serial driver with serial driver core
@@@ -252,7 -252,7 +253,8 @@@ void serial_initialize(void
        s3c44b0_serial_initialize();
        sa1100_serial_initialize();
        sh_serial_initialize();
 +      arm_dcc_initialize();
+       mxs_auart_initialize();
  
        serial_assign(default_serial_console()->name);
  }

diff --cc tools/Makefile
Simple merge

diff --cc tools/imximage.c
Simple merge