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

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

diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 6412f31f8a8b493c1ee443960406d0aa8c893f87..823404671e4b4dbcfb21e7fa91283c555d282ee6 100644 (file)
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
+CONFIG_SYS_PROMPT="Trats # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
@@ -9,7 +10,5 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_SYS_PROMPT="Trats # "