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

diff --combined common/spl/spl.c
index 12aed02935648eaa43d1faeb465d75aecb48160e,0039716774c5581189af85548d2c278076d8bfee..14320fe75c10aa673122c1ef0a08664dd37a8784
--- 1/common/spl/spl.c
--- 2/common/spl/spl.c
+++ b/common/spl/spl.c
@@@ -13,6 -13,7 +13,6 @@@
  #include <nand.h>
  #include <fat.h>
  #include <version.h>
 -#include <i2c.h>
  #include <image.h>
  #include <malloc.h>
  #include <dm/root.h>
@@@ -202,7 -203,7 +202,7 @@@ int spl_init(void
        gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
        gd->malloc_ptr = 0;
  #endif
 -      if (CONFIG_IS_ENABLED(OF_CONTROL)) {
 +      if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
                ret = fdtdec_setup();
                if (ret) {
                        debug("fdtdec_setup() returned error %d\n", ret);
@@@ -210,8 -211,7 +210,8 @@@
                }
        }
        if (IS_ENABLED(CONFIG_SPL_DM)) {
 -              ret = dm_init_and_scan(true);
 +              /* With CONFIG_OF_PLATDATA, bring in all devices */
 +              ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA));
                if (ret) {
                        debug("dm_init_and_scan() returned error %d\n", ret);
                        return ret;
@@@ -270,7 -270,7 +270,7 @@@ struct boot_device_name boot_name_table
  #ifdef CONFIG_SPL_YMODEM_SUPPORT
        { BOOT_DEVICE_UART, "UART" },
  #endif
- #ifdef CONFIG_SPL_SPI_SUPPORT
+ #if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
        { BOOT_DEVICE_SPI, "SPI" },
  #endif
  #ifdef CONFIG_SPL_ETH_SUPPORT
@@@ -346,7 -346,7 +346,7 @@@ static int spl_load_image(u32 boot_devi
        case BOOT_DEVICE_UART:
                return spl_ymodem_load_image();
  #endif
- #ifdef CONFIG_SPL_SPI_SUPPORT
+ #if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
        case BOOT_DEVICE_SPI:
                return spl_spi_load_image();
  #endif