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

- Various MTD fixes from Boris
- Zap various unused / legacy paths.
- pxa3xx NAND update from Miquel

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc cmd/eeprom.c
index e88cb131a16d0bf08017ea1d3a36df724f696541,9136630ada4a27494b8539e4a77ad111dfd50a0b..6c29b33ba34c9fe1e52603d60765aed0612a5379
--- 1/cmd/eeprom.c
--- 2/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@@ -129,31 -124,6 +124,23 @@@ static int eeprom_rw_block(unsigned off
  {
        int ret = 0;
  
-       /* SPI */
- #if defined(CONFIG_MPC8XX_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
-       if (read)
-               spi_read(addr, alen, buffer, len);
-       else
-               spi_write(addr, alen, buffer, len);
- #else /* I2C */
- 
 +#if defined(CONFIG_DM_I2C) && defined(CONFIG_SYS_I2C_EEPROM_BUS)
 +      struct udevice *dev;
 +
 +      ret = i2c_get_chip_for_busnum(CONFIG_SYS_I2C_EEPROM_BUS, addr[0],
 +                                    alen - 1, &dev);
 +      if (ret) {
 +              printf("%s: Cannot find udev for a bus %d\n", __func__,
 +                     CONFIG_SYS_I2C_EEPROM_BUS);
 +              return CMD_RET_FAILURE;
 +      }
 +
 +      if (read)
 +              ret = dm_i2c_read(dev, offset, buffer, len);
 +      else
 +              ret = dm_i2c_write(dev, offset, buffer, len);
 +
 +#else /* Non DM I2C support - will be removed */
  #if defined(CONFIG_SYS_I2C_EEPROM_BUS)
        i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
  #endif
@@@ -162,10 -132,9 +149,9 @@@
                ret = i2c_read(addr[0], offset, alen - 1, buffer, len);
        else
                ret = i2c_write(addr[0], offset, alen - 1, buffer, len);
- #endif
 -
 +#endif /* CONFIG_DM_I2C && CONFIG_SYS_I2C_EEPROM_BUS */
        if (ret)
 -              ret = 1;
 +              ret = CMD_RET_FAILURE;
  
        return ret;
  }

diff --cc common/board_f.c
index 835b7247c58d634bf7655ca87d96e85acd788ae4,a3e80ca9512f79667ea416515b03cd374c6706c2..149a7229e8fa982d53ce003c67ddb2db7d45e2e1
--- 1/common/board_f.c
--- 2/common/board_f.c
+++ b/common/board_f.c
@@@ -24,10 -23,6 +24,9 @@@
  #include <os.h>
  #include <post.h>
  #include <relocate.h>
- #include <spi.h>
 +#ifdef CONFIG_SPL
 +#include <spl.h>
 +#endif
  #include <status_led.h>
  #include <sysreset.h>
  #include <timer.h>

diff --cc common/board_r.c
Simple merge

diff --cc drivers/mtd/spi/sf_probe.c
Simple merge

diff --cc include/common.h
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge