diff options
| author | Marek Vasut <marex@denx.de> | 2014-12-16 14:07:22 +0100 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-14 11:37:39 -0500 |
| commit | 38117231326cf65a70fc15b746d1241e2298b1ab (patch) | |
| tree | cff429beb25bc537d3d4627cee30682dfc203c0f /common | |
| parent | 67ddd955fc7a10c3808503a98838a3501ffafece (diff) | |
| download | talos-obmc-uboot-38117231326cf65a70fc15b746d1241e2298b1ab.tar.gz talos-obmc-uboot-38117231326cf65a70fc15b746d1241e2298b1ab.zip | |
image: Enable OpenRTOS booting via fitImage
Allow booting the OpenRTOS payloads via fitImage image type.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fit.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index 4ffc5aaa51..1589ee3e4f 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1518,6 +1518,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, size_t size; int type_ok, os_ok; ulong load, data, len; + uint8_t os; const char *prop_name; int ret; @@ -1612,10 +1613,15 @@ int fit_image_load(bootm_headers_t *images, ulong addr, (image_type == IH_TYPE_KERNEL && fit_image_check_type(fit, noffset, IH_TYPE_KERNEL_NOLOAD)); + os_ok = image_type == IH_TYPE_FLATDT || - fit_image_check_os(fit, noffset, IH_OS_LINUX); + fit_image_check_os(fit, noffset, IH_OS_LINUX) || + fit_image_check_os(fit, noffset, IH_OS_OPENRTOS); if (!type_ok || !os_ok) { - printf("No Linux %s %s Image\n", genimg_get_arch_name(arch), + fit_image_get_os(fit, noffset, &os); + printf("No %s %s %s Image\n", + genimg_get_os_name(os), + genimg_get_arch_name(arch), genimg_get_type_name(image_type)); bootstage_error(bootstage_id + BOOTSTAGE_SUB_CHECK_ALL); return -EIO; |
