diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-25 20:22:48 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-25 20:22:48 -0400 |
commit | 6523dbf7cce8d8c903346f756e0e41e46ce6d6b9 (patch) | |
tree | 0e099cd46a629e7723ed76d386bfaa8fe16d6453 /configs | |
parent | f9a90ace21c52a5a6948b9f3a0d8fe088e47a595 (diff) | |
parent | 4349b55b9953d0bb591f13ca9985edf591348ced (diff) | |
download | u-boot-imx-6523dbf7cce8d8c903346f756e0e41e46ce6d6b9.zip u-boot-imx-6523dbf7cce8d8c903346f756e0e41e46ce6d6b9.tar.gz u-boot-imx-6523dbf7cce8d8c903346f756e0e41e46ce6d6b9.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'configs')
-rw-r--r-- | configs/malta_defconfig | 2 | ||||
-rw-r--r-- | configs/maltael_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/configs/malta_defconfig b/configs/malta_defconfig index a16f10b..3c3bb16 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 5289797..b245d91 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 |