From 0ddcdbebf70d5fc0ebbd86303c22446f7673a522 Mon Sep 17 00:00:00 2001 From: Ioana Ciornei Date: Thu, 15 Apr 2021 12:01:13 +0300 Subject: [PATCH] fit: remove an additional check for FIT images This is a partial revert of the following commit from upstream. commit 79af75f7776f ("fit: Don't allow verification of images with @ nodes") This workaround is needed because the fit image for the MC firmware image uses a firmware@1 node which describes the MC image, setup which is not accepted starting with the commit referenced. The MC firmware images will also be changed but this commit is also needed so that we can use this u-boot with older MC firmware images which cannot be changed. Signed-off-by: Ioana Ciornei --- common/image-fit.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index 94501b1071..445d5adbfe 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1371,19 +1371,10 @@ error: */ int fit_image_verify(const void *fit, int image_noffset) { - const char *name = fit_get_name(fit, image_noffset, NULL); const void *data; size_t size; char *err_msg = ""; - if (strchr(name, '@')) { - /* - * We don't support this since libfdt considers names with the - * name root but different @ suffix to be equal - */ - err_msg = "Node name contains @"; - goto err; - } /* Get image data and data length */ if (fit_image_get_data_and_size(fit, image_noffset, &data, &size)) { err_msg = "Can't get image data/size"; -- 2.17.1