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 edc589e5b7012d650fc14db4e120d3c32db36651,5608352a451acfbb436dfad827e56213feac6f3a..f13d5fc58161a2bd8cb91ed87d5c1acc352a5db6
--- 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 4ce4058c759f331e7a68c6c1b5893d8aec7267ac,a7d3ae63036c4034260ce6c9c5e369e34e4c0d24..5b3fa43eb46cbbc0d85f95c849352f385740da74
--- 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
   */

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