diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 14:45:06 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 14:45:06 +0200 |
| commit | a19b0dd62d7b8efc658fa1aa685ff5665878f3ee (patch) | |
| tree | 1fadf0fb3da83203ba28f209ec99e1b33e03f4d5 /common/cmd_fpga.c | |
| parent | 60985bba58e7695dac1fddae8cdbb62d8cfd1254 (diff) | |
| parent | a71d45d706a5b51c348160163b6c159632273fed (diff) | |
| download | u-boot-imx-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.zip u-boot-imx-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.tar.gz u-boot-imx-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
common/cmd_fpga.c
drivers/usb/host/ohci-at91.c
Diffstat (limited to 'common/cmd_fpga.c')
| -rw-r--r-- | common/cmd_fpga.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c index 5e1d037..3cd1b13 100644 --- a/common/cmd_fpga.c +++ b/common/cmd_fpga.c @@ -210,8 +210,8 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) } /* verify integrity */ - if (!fit_image_check_hashes(fit_hdr, noffset)) { - puts("Bad Data Hash\n"); + if (!fit_image_verify(fit_hdr, noffset)) { + puts ("Bad Data Hash\n"); return 1; } |