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

diff --combined arch/arm/dts/tegra30-colibri.dts
index df79c26a45898ee5a89b348950db872918e7f405,dd6009af47cbef4ae3430229e775d8282cfe008a..572520a00ec5e330d5bbacd4b187967d45db8ec8
--- 1/arch/arm/dts/tegra30-colibri.dts
--- 2/arch/arm/dts/tegra30-colibri.dts
+++ b/arch/arm/dts/tegra30-colibri.dts
@@@ -6,13 -6,16 +6,17 @@@
        model = "Toradex Colibri T30";
        compatible = "toradex,colibri_t30", "nvidia,tegra30";
  
+       chosen {
+               stdout-path = &uarta;
+       };
+ 
        aliases {
                i2c0 = "/i2c@7000d000";
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c700";
                sdhci0 = "/sdhci@78000600";
                sdhci1 = "/sdhci@78000200";
 +              spi0 = "/spi@7000d400";
                usb0 = "/usb@7d000000";
                usb1 = "/usb@7d004000"; /* on module only, for ASIX */
                usb2 = "/usb@7d008000";

diff --combined include/configs/tegra-common-post.h
index a258699af7ec5fb089c78daf52496a6c919f983f,9abf2683c1278466d99773088158bed914108635..c3ad8beb903d9e131ae596ee98fbb725297614ec
--- 1/include/configs/tegra-common-post.h
--- 2/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@@ -59,7 -59,7 +59,7 @@@
        BOARD_EXTRA_ENV_SETTINGS
  
  #if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
 -#define CONFIG_FDT_SPI
 +#define CONFIG_TEGRA_SPI
  #endif
  
  /* overrides for SPL build here */
@@@ -67,10 -67,6 +67,6 @@@
  
  #define CONFIG_SKIP_LOWLEVEL_INIT
  
- /* remove devicetree support */
- #ifdef CONFIG_OF_CONTROL
- #endif
- 
  /* remove I2C support */
  #ifdef CONFIG_SYS_I2C_TEGRA
  #undef CONFIG_SYS_I2C_TEGRA

diff --combined include/configs/tegra-common.h
index 981a8d2adb8b59b08c2ac7e2b75a538f218b02f8,723ef72ef41c63cd77a667b0db71836e035da25b..5d2b12a11d1ef1e1494fa76ae14f5eeae8401797
--- 1/include/configs/tegra-common.h
--- 2/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@@ -24,8 -24,6 +24,8 @@@
  #ifndef CONFIG_SPL_BUILD
  #define CONFIG_DM_SERIAL
  #endif
 +#define CONFIG_DM_SPI
 +#define CONFIG_DM_SPI_FLASH
  
  #define CONFIG_SYS_TIMER_RATE         1000000
  #define CONFIG_SYS_TIMER_COUNTER      NV_PA_TMRUS_BASE
@@@ -118,6 -116,8 +118,8 @@@
  #define CONFIG_SYS_MEMTEST_START      (NV_PA_SDRC_CS0 + 0x600000)
  #define CONFIG_SYS_MEMTEST_END                (CONFIG_SYS_MEMTEST_START + 0x100000)
  
+ #define CONFIG_USE_ARCH_MEMCPY
+ 
  /*-----------------------------------------------------------------------
   * Physical Memory Map
   */
@@@ -154,6 -154,10 +156,6 @@@
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_GPIO_SUPPORT
  
 -#ifdef CONFIG_SPL_BUILD
 -# define CONFIG_USE_PRIVATE_LIBGCC
 -#endif
 -
  #define CONFIG_SYS_GENERIC_BOARD
  
  /* Misc utility code */