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

[platform/kernel/u-boot.git] / common / image.c

diff --git a/common/image.c b/common/image.c
index c6cd85e..f175541 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -141,6 +141,7 @@ static const table_entry_t uimage_type[] = {
        {       IH_TYPE_FLATDT,     "flat_dt",    "Flat Device Tree",   },
        {       IH_TYPE_KWBIMAGE,   "kwbimage",   "Kirkwood Boot Image",},
        {       IH_TYPE_IMXIMAGE,   "imximage",   "Freescale i.MX Boot Image",},
+       {       IH_TYPE_UBLIMAGE,   "ublimage",   "Davinci UBL image",},
        {       -1,                 "",           "",                   },
 };
 
@@ -1274,7 +1275,7 @@ int boot_relocate_fdt (struct lmb *lmb, char **of_flat_tree, ulong *of_size)
                        }
                } else {
                        of_start =
-                           (void *)(ulong) mb_alloc(lmb, of_len, 0x1000);
+                           (void *)(ulong) lmb_alloc(lmb, of_len, 0x1000);
                }
        } else {
                of_start =