From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 11 May 2013 07:25:36 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.07-rc1~85
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=ec7023db8dc95966919589541f1ca09355a3f7a5

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

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

ec7023db8dc95966919589541f1ca09355a3f7a5
diff --cc drivers/mtd/nand/mxc_nand_spl.c
index edc589e5b7,5608352a45..f13d5fc581
--- a/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 4ce4058c75,a7d3ae6303..5b3fa43eb4
--- a/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
   */