From: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Date: Mon, 14 Oct 2013 08:27:38 +0000 (+0200)
Subject: Fix: nommu I2C adapter relocation error
X-Git-Tag: v2014.01-rc1~208^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83d271b5ffc19e98098861dd21e940cf53545a43;p=oweals%2Fu-boot.git

Fix: nommu I2C adapter relocation error

NoMMU systems have a access violation problem with i2c_reloc_fixup.
Blame for it is a double relocation of the adapter itself. The
i2c_adap_p is already relocated, if i2c_reloc_fixup is called.
This patch removes the relocation of i2c_adap_p from i2c_reloc_fixup
to fix this.

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
---

diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index fe341cde64..b067b7c6ff 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -53,10 +53,6 @@ void i2c_reloc_fixup(void)
 		return;
 
 	for (i = 0; i < max; i++) {
-		/* adapter itself */
-		addr = (unsigned long)i2c_adap_p;
-		addr += gd->reloc_off;
-		i2c_adap_p = (struct i2c_adapter *)addr;
 		/* i2c_init() */
 		addr = (unsigned long)i2c_adap_p->init;
 		addr += gd->reloc_off;