aboutsummaryrefslogtreecommitdiff
path: root/common/bootm.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-10 07:07:49 -0400
committerTom Rini <trini@konsulko.com>2019-05-10 07:07:49 -0400
commit927a37df9f5ed33fc350b9cc509d9f50ffaf5cd2 (patch)
tree0afab773bb17cb8f33ab6e2e2b969423ec36140b /common/bootm.c
parentf30f268a07b0c9e4418366debc9ad0100a47cea4 (diff)
parent0d7b6cffa532eecfdc7cb87c2c65cd311344981f (diff)
Merge branch '2019-05-09-master-imports'
- Minor fixes (ata memory leak, implement feedback on ohci-da8xx changes, avb test fix, mmc test fix, spelling fixes, make FIT really optional, fit-dtb blob cleanups, TI K3 workflow improvements, bootz can boot barebox on 32bit ARM).
Diffstat (limited to 'common/bootm.c')
-rw-r--r--common/bootm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/bootm.c b/common/bootm.c
index b5d37d38db..d193751647 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -924,6 +924,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
memmove(to, from, len);
}
+#if defined(CONFIG_FIT_SIGNATURE)
static int bootm_host_load_image(const void *fit, int req_image_type)
{
const char *fit_uname_config = NULL;
@@ -988,5 +989,6 @@ int bootm_host_load_images(const void *fit, int cfg_noffset)
/* Return the first error we found */
return err;
}
+#endif
#endif /* ndef USE_HOSTCC */