Kconfig: Move CONFIG_FIT and related options to Kconfig

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

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 29303441d92e73c7438b2b7d2f13472de843c3e8..fcfbf6542c97beeb41d95ecc899b42ea21421692 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
+CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -13,11 +14,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 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