diff options
author | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
commit | f46c25583a73042edf432b209ee4b93bc3f7e762 (patch) | |
tree | a7cbd8afde1b0cbf86a9c8150cbd737df3ee82c9 /board/Marvell/db-mv784mp-gp/kwbimage.cfg | |
parent | db18f548cb7b5ff99223b66eac1966eb45230817 (diff) | |
parent | f822d8578ba395d9af1cc315a2fb87b1eed3d355 (diff) |
Merge git://www.denx.de/git/u-boot-marvell
Conflicts:
arch/arm/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/Marvell/db-mv784mp-gp/kwbimage.cfg')
-rw-r--r-- | board/Marvell/db-mv784mp-gp/kwbimage.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/Marvell/db-mv784mp-gp/kwbimage.cfg b/board/Marvell/db-mv784mp-gp/kwbimage.cfg index cc05792556..1f748db37c 100644 --- a/board/Marvell/db-mv784mp-gp/kwbimage.cfg +++ b/board/Marvell/db-mv784mp-gp/kwbimage.cfg @@ -9,4 +9,4 @@ VERSION 1 BOOT_FROM spi # Binary Header (bin_hdr) with DDR3 training code -BINARY spl/u-boot-spl.bin 0000005b 00000068 +BINARY spl/u-boot-spl-dtb.bin 0000005b 00000068 |