summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-25 20:22:48 -0400
committerTom Rini <trini@konsulko.com>2016-05-25 20:22:48 -0400
commit6523dbf7cce8d8c903346f756e0e41e46ce6d6b9 (patch)
tree0e099cd46a629e7723ed76d386bfaa8fe16d6453 /configs
parentf9a90ace21c52a5a6948b9f3a0d8fe088e47a595 (diff)
parent4349b55b9953d0bb591f13ca9985edf591348ced (diff)
downloadblackbird-obmc-uboot-6523dbf7cce8d8c903346f756e0e41e46ce6d6b9.tar.gz
blackbird-obmc-uboot-6523dbf7cce8d8c903346f756e0e41e46ce6d6b9.zip
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'configs')
-rw-r--r--configs/malta_defconfig2
-rw-r--r--configs/maltael_defconfig2
2 files changed, 4 insertions, 0 deletions
diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index a16f10be6a..3c3bb16522 100644
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -1,5 +1,6 @@
CONFIG_MIPS=y
CONFIG_TARGET_MALTA=y
+CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="malta # "
# CONFIG_CMD_LOADB is not set
@@ -9,5 +10,6 @@ CONFIG_SYS_PROMPT="malta # "
CONFIG_CMD_DHCP=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_PING=y
+CONFIG_OF_EMBED=y
CONFIG_SYS_NS16550=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig
index 5289797748..b245d915ef 100644
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -1,6 +1,7 @@
CONFIG_MIPS=y
CONFIG_TARGET_MALTA=y
CONFIG_SYS_LITTLE_ENDIAN=y
+CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="maltael # "
# CONFIG_CMD_LOADB is not set
@@ -10,5 +11,6 @@ CONFIG_SYS_PROMPT="maltael # "
CONFIG_CMD_DHCP=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_PING=y
+CONFIG_OF_EMBED=y
CONFIG_SYS_NS16550=y
CONFIG_USE_PRIVATE_LIBGCC=y
OpenPOWER on IntegriCloud