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

Conflicts:
	drivers/mtd/nand/mxc_nand_spl.c
	include/configs/m28evk.h

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc drivers/mtd/nand/mxc_nand_spl.c
index edc589e,5608352..f13d5fc
--- 1/drivers/mtd/nand/mxc_nand_spl.c
--- 2/drivers/mtd/nand/mxc_nand_spl.c
+++ b/drivers/mtd/nand/mxc_nand_spl.c
@@@ -355,3 -358,16 +358,4 @@@ void nand_boot(void
                hang();
        }
  }
 -
 -/*
 - * Called in case of an exception.
 - */
 -void hang(void)
 -{
 -      /* Loop forever */
 -      while (1) ;
 -}
+ #endif
 -
 -void nand_init(void) {}
 -void nand_deselect(void) {}

diff --cc include/configs/m28evk.h
index 4ce4058,a7d3ae6..5b3fa43
--- 1/include/configs/m28evk.h
--- 2/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@@ -55,31 -55,29 +55,32 @@@
   * U-Boot Commands
   */
  #include <config_cmd_default.h>
 -#define       CONFIG_DISPLAY_CPUINFO
 -#define       CONFIG_DOS_PARTITION
 +#define CONFIG_DISPLAY_CPUINFO
 +#define CONFIG_DOS_PARTITION
  
 -#define       CONFIG_CMD_CACHE
 -#define       CONFIG_CMD_DATE
 -#define       CONFIG_CMD_DHCP
 -#define       CONFIG_CMD_EEPROM
 -#define       CONFIG_CMD_EXT2
 -#define       CONFIG_CMD_FAT
 -#define       CONFIG_CMD_GPIO
 -#define       CONFIG_CMD_I2C
 -#define       CONFIG_CMD_MII
 -#define       CONFIG_CMD_MMC
 -#define       CONFIG_CMD_NAND
 -#define       CONFIG_CMD_NET
 -#define       CONFIG_CMD_NFS
 -#define       CONFIG_CMD_PING
 -#define       CONFIG_CMD_SETEXPR
 -#define       CONFIG_CMD_SF
 -#define       CONFIG_CMD_SPI
 -#define       CONFIG_CMD_USB
 +#define CONFIG_CMD_CACHE
 +#define CONFIG_CMD_DATE
 +#define CONFIG_CMD_DHCP
 +#define CONFIG_CMD_EEPROM
 +#define CONFIG_CMD_EXT2
 +#define CONFIG_CMD_FAT
 +#define CONFIG_CMD_GPIO
 +#define CONFIG_CMD_GREPENV
 +#define CONFIG_CMD_I2C
 +#define CONFIG_CMD_MII
 +#define CONFIG_CMD_MMC
 +#define CONFIG_CMD_NAND
 +#define CONFIG_CMD_NET
 +#define CONFIG_CMD_NFS
 +#define CONFIG_CMD_PING
 +#define CONFIG_CMD_SETEXPR
 +#define CONFIG_CMD_SF
 +#define CONFIG_CMD_SPI
 +#define CONFIG_CMD_USB
+ #define       CONFIG_VIDEO
  
 +#define CONFIG_REGEX                  /* Enable regular expression support */
 +
  /*
   * Memory configurations
   */
@@@ -271,17 -269,35 +272,35 @@@
  #endif
  
  /*
+  * LCD
+  */
+ #ifdef        CONFIG_VIDEO
+ #define       CONFIG_CFB_CONSOLE
+ #define       CONFIG_VIDEO_MXS
+ #define       CONFIG_VIDEO_LOGO
+ #define       CONFIG_VIDEO_SW_CURSOR
+ #define       CONFIG_VGA_AS_SINGLE_DEVICE
+ #define       CONFIG_SYS_CONSOLE_IS_IN_ENV
+ #define       CONFIG_SPLASH_SCREEN
+ #define       CONFIG_CMD_BMP
+ #define       CONFIG_BMP_16BPP
+ #define       CONFIG_VIDEO_BMP_RLE8
+ #define       CONFIG_VIDEO_BMP_GZIP
+ #define       CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  (512 << 10)
+ #endif
+ 
+ /*
   * Boot Linux
   */
 -#define       CONFIG_CMDLINE_TAG
 -#define       CONFIG_SETUP_MEMORY_TAGS
 -#define       CONFIG_BOOTDELAY        3
 -#define       CONFIG_BOOTFILE         "uImage"
 -#define       CONFIG_BOOTARGS         "console=ttyAMA0,115200n8 "
 -#define       CONFIG_BOOTCOMMAND      "run bootcmd_net"
 -#define       CONFIG_LOADADDR         0x42000000
 -#define       CONFIG_SYS_LOAD_ADDR    CONFIG_LOADADDR
 -#define       CONFIG_OF_LIBFDT
 +#define CONFIG_CMDLINE_TAG
 +#define CONFIG_SETUP_MEMORY_TAGS
 +#define CONFIG_BOOTDELAY      3
 +#define CONFIG_BOOTFILE               "uImage"
 +#define CONFIG_BOOTARGS               "console=ttyAMA0,115200n8 "
 +#define CONFIG_BOOTCOMMAND    "run bootcmd_net"
 +#define CONFIG_LOADADDR               0x42000000
 +#define CONFIG_SYS_LOAD_ADDR  CONFIG_LOADADDR
 +#define CONFIG_OF_LIBFDT
  
  /*
   * Extra Environments

diff --cc include/configs/mx28evk.h
Simple merge