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

- Audio support

diff --combined configs/nyan-big_defconfig
index 46bdb03,a6546e5..ac7b505
--- 1/configs/nyan-big_defconfig
--- 2/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@@ -2,7 -2,6 +2,7 @@@ CONFIG_ARM=
  CONFIG_TEGRA=y
  CONFIG_SYS_TEXT_BASE=0x81000100
  CONFIG_NR_DRAM_BANKS=2
 +CONFIG_BOOTSTAGE_STASH_ADDR=0x83000000
  CONFIG_DEBUG_UART_BASE=0x70006000
  CONFIG_DEBUG_UART_CLOCK=408000000
  CONFIG_TEGRA124=y
@@@ -14,7 -13,9 +14,8 @@@ CONFIG_OF_SYSTEM_SETUP=
  CONFIG_BOOTSTAGE=y
  CONFIG_SPL_BOOTSTAGE=y
  CONFIG_BOOTSTAGE_STASH=y
 -CONFIG_BOOTSTAGE_STASH_ADDR=0x83000000
  CONFIG_SYS_STDIO_DEREGISTER=y
+ CONFIG_LOG_DEFAULT_LEVEL=7
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_SPL_TEXT_BASE=0x80108000
  CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
@@@ -32,6 -33,8 +33,8 @@@ CONFIG_CMD_USB_MASS_STORAGE=
  # CONFIG_CMD_NFS is not set
  CONFIG_CMD_BMP=y
  CONFIG_CMD_CACHE=y
+ CONFIG_CMD_TIME=y
+ CONFIG_CMD_SOUND=y
  CONFIG_CMD_BOOTSTAGE=y
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
@@@ -62,6 -65,10 +65,10 @@@ CONFIG_DM_REGULATOR_FIXED=
  CONFIG_PWM_TEGRA=y
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYS_NS16550=y
+ CONFIG_SOUND=y
+ CONFIG_I2S=y
+ CONFIG_I2S_TEGRA=y
+ CONFIG_SOUND_MAX98090=y
  CONFIG_TEGRA114_SPI=y
  CONFIG_TPM_TIS_INFINEON=y
  CONFIG_USB=y