From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 8 Oct 2014 19:20:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'u-boot-imx/master'
X-Git-Tag: KARO-TXA5-2015-06-26~541^2~19
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=4b19b7448e63bab8af17abbb30acff00d8f0dc99

Merge remote-tracking branch 'u-boot-imx/master'

The single file conflict below is actually trivial.

Conflicts:
	board/boundary/nitrogen6x/nitrogen6x.c
---

4b19b7448e63bab8af17abbb30acff00d8f0dc99
diff --cc board/boundary/nitrogen6x/nitrogen6x.c
index 7edfe19367,2762fcffae..951b820cbb
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@@ -328,12 -335,7 +335,12 @@@ int board_mmc_init(bd_t *bis
  #endif
  
  #ifdef CONFIG_MXC_SPI
 +int board_spi_cs_gpio(unsigned bus, unsigned cs)
 +{
 +	return (bus == 0 && cs == 0) ? (IMX_GPIO_NR(3, 19)) : -1;
 +}
 +
- iomux_v3_cfg_t const ecspi1_pads[] = {
+ static iomux_v3_cfg_t const ecspi1_pads[] = {
  	/* SS1 */
  	MX6_PAD_EIM_D19__GPIO3_IO19  | MUX_PAD_CTRL(NO_PAD_CTRL),
  	MX6_PAD_EIM_D17__ECSPI1_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL),