From: Tom Rini <trini@ti.com>
Date: Mon, 24 Nov 2014 17:02:12 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: KARO-TXA5-2015-06-26~227
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=dee332ffb735f65ab922118791a583c17bb0b795;hp=-c

Merge branch 'master' of git://www.denx.de/git/u-boot-imx
---

dee332ffb735f65ab922118791a583c17bb0b795
diff --combined arch/arm/lib/crt0.S
index 823b233bc8,a33ad3e785..22df3e5b83
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@@ -78,7 -78,7 +78,7 @@@ clr_gd
  	strlo	r0, [r1]		/* clear 32-bit GD word */
  	addlo	r1, r1, #4		/* move to next */
  	blo	clr_gd
 -#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_BUILD)
 +#if defined(CONFIG_SYS_MALLOC_F_LEN)
  	sub	sp, sp, #CONFIG_SYS_MALLOC_F_LEN
  	str	sp, [r9, #GD_MALLOC_BASE]
  #endif
@@@ -104,6 -104,11 +104,11 @@@
  	ldr	r0, [r9, #GD_RELOCADDR]		/* r0 = gd->relocaddr */
  	b	relocate_code
  here:
+ /*
+  * now relocate vectors
+  */
+ 
+ 	bl	relocate_vectors
  
  /* Set up final (full) environment */
  
diff --combined drivers/block/sata_sil.c
index b483dbb5d1,ea7d76a167..daff7d4ab5
--- a/drivers/block/sata_sil.c
+++ b/drivers/block/sata_sil.c
@@@ -519,7 -519,7 +519,7 @@@ int init_sata(int dev
  	u16 word;
  
  	if (init_done == 1 && dev < sata_info.maxport)
 -		return 1;
 +		return 0;
  
  	init_done = 1;
  
@@@ -571,6 -571,11 +571,11 @@@
  	return 0;
  }
  
+ int reset_sata(int dev)
+ {
+ 	return 0;
+ }
+ 
  /*
   * SATA interface between low level driver and command layer
   */
diff --combined drivers/mmc/fsl_esdhc.c
index 90b8ed01cc,59b470d01b..cb46b13cbd
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@@ -23,6 -23,13 +23,13 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
+ #define SDHCI_IRQ_EN_BITS		(IRQSTATEN_CC | IRQSTATEN_TC | \
+ 				IRQSTATEN_CINT | \
+ 				IRQSTATEN_CTOE | IRQSTATEN_CCE | IRQSTATEN_CEBE | \
+ 				IRQSTATEN_CIE | IRQSTATEN_DTOE | IRQSTATEN_DCE | \
+ 				IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \
+ 				IRQSTATEN_DINT)
+ 
  struct fsl_esdhc {
  	uint    dsaddr;		/* SDMA system address register */
  	uint    blkattr;	/* Block attributes register */
@@@ -558,6 -565,7 +565,7 @@@ int fsl_esdhc_initialize(bd_t *bis, str
  	esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_HCKEN
  				| SYSCTL_IPGEN | SYSCTL_CKEN);
  
+ 	writel(SDHCI_IRQ_EN_BITS, &regs->irqstaten);
  	memset(&cfg->cfg, 0, sizeof(cfg->cfg));
  
  	voltage_caps = 0;
@@@ -610,7 -618,7 +618,7 @@@
  #endif
  
  	cfg->cfg.f_min = 400000;
 -	cfg->cfg.f_max = min(gd->arch.sdhc_clk, 52000000);
 +	cfg->cfg.f_max = min(gd->arch.sdhc_clk, (u32)52000000);
  
  	cfg->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;