Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

diff --combined MAINTAINERS
index d3f1beab023f2566ed2d482a2599f83cb560b8a8,059b4879b35cc48def1937b670e1d2d3b698c3c8..0951108a8cd9e092fefd70aa470672b50bc0e0e6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -976,6 -976,8 +976,8 @@@ Tom Warren <twarren@nvidia.com
  
        harmony         Tegra20 (ARM7 & A9 Dual Core)
        seaboard        Tegra20 (ARM7 & A9 Dual Core)
+       cardhu          Tegra30 (ARM7 & A9 Quad Core)
+       dalmore         Tegra114 (ARM7 & A15 Quad Core)
  
  Tom Warren <twarren@nvidia.com>
  Stephen Warren <swarren@nvidia.com>
@@@ -1037,14 -1039,6 +1039,14 @@@ Pali Rohár <pali.rohar@gmail.com
  
        nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
  
 +Eric Nelson <eric.nelson@boundarydevices.com>
 +      nitrogen6dl             i.MX6DL         1GB
 +      nitrogen6dl2g           i.MX6DL         2GB
 +      nitrogen6q              i.MX6Q/6D       1GB
 +      nitrogen6q2g            i.MX6Q/6D       2GB
 +      nitrogen6s              i.MX6S          512MB
 +      nitrogen6s1g            i.MX6S          1GB
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --combined include/configs/tegra20-common.h
index 186e023364349d7e6fa2f753784405aede94f6af,311680e9e1903f29b191b63fb2b2213ad638639e..e464e06173e8bf570e166a0d69b4a9bb13485bcc
--- 1/include/configs/tegra20-common.h
--- 2/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@@ -25,12 -25,6 +25,12 @@@
  #define _TEGRA20_COMMON_H_
  #include "tegra-common.h"
  
 +/*
 + * Errata configuration
 + */
 +#define CONFIG_ARM_ERRATA_742230
 +#define CONFIG_ARM_ERRATA_751472
 +
  /*
   * NS16550 Configuration
   */
@@@ -114,13 -108,7 +114,7 @@@
  /* Total I2C ports on Tegra20 */
  #define TEGRA_I2C_NUM_CONTROLLERS     4
  
- #define CONFIG_PARTITION_UUIDS
- #define CONFIG_CMD_PART
- 
  #define CONFIG_SYS_NAND_SELF_INIT
  #define CONFIG_SYS_NAND_ONFI_DETECTION
  
- /* Misc utility code */
- #define CONFIG_BOUNCE_BUFFER
- 
  #endif /* _TEGRA20_COMMON_H_ */