From: Tom Rini <trini@konsulko.com>
Date: Wed, 29 May 2019 11:28:40 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-tegra
X-Git-Tag: v2019.07-rc4~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e2822ccc2c7c0ba8d7d959a1fa1e6221ed135423;p=oweals%2Fu-boot.git

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

- Audio support
---

e2822ccc2c7c0ba8d7d959a1fa1e6221ed135423
diff --cc configs/nyan-big_defconfig
index 46bdb037ec,a6546e5ba3..ac7b505dc7
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@@ -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) # "