diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-31 10:07:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-31 10:07:01 -0400 |
| commit | 150db4264d210f6fd4fbf5e0e9cafc135eb13c17 (patch) | |
| tree | 34ab1f6c9c0eb1878ab3a2d824d47f7a73ef4ea9 /common/image-fit.c | |
| parent | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (diff) | |
| parent | 7f6b0f3357bd25c7ed23f8f5a76a99ab9a0fd398 (diff) | |
Merge branch '2020-03-31-master-imports'
- mpc8xxx GPIO, SPI bugfixes
- Add VxWorks to FIT images
- macb ethernet driver bugfix
Diffstat (limited to 'common/image-fit.c')
| -rw-r--r-- | common/image-fit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index 4435bc4f1d..6da69d25ff 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -2007,7 +2007,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr, fit_image_check_os(fit, noffset, IH_OS_LINUX) || fit_image_check_os(fit, noffset, IH_OS_U_BOOT) || fit_image_check_os(fit, noffset, IH_OS_OPENRTOS) || - fit_image_check_os(fit, noffset, IH_OS_EFI); + fit_image_check_os(fit, noffset, IH_OS_EFI) || + fit_image_check_os(fit, noffset, IH_OS_VXWORKS); /* * If either of the checks fail, we should report an error, but |