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

[people/ms/u-boot.git] / configs / beaver_defconfig

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index ad74b85f3516b2b27a977cbd95bdc9c8d5d589d0..29303441d92e73c7438b2b7d2f13472de843c3e8 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -1,16 +1,25 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
+CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
+<<<<<<< HEAD
+CONFIG_SPI_FLASH_WINBOND=y
+=======
+CONFIG_PCI_TEGRA=y
+>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
+CONFIG_SYS_NS16550=y
+CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y