Merge branch '2019-10-28-azure-ci-support'

[oweals/u-boot.git] / configs / trimslice_defconfig

diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index c1bdedf837d461b8649b61ad616ffc359887e7f5..7ebdec4232c40d2aae24d0fd14fbe2d9bc1215bc 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -1,10 +1,10 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_TEGRA20=y
 CONFIG_TARGET_TRIMSLICE=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
-CONFIG_NR_DRAM_BANKS=2
+CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
@@ -23,9 +23,14 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=48000000
 CONFIG_SPL_DM=y
+CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_PCI=y
@@ -37,6 +42,6 @@ CONFIG_TEGRA20_SFLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y