From patchwork Thu May 23 10:39:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Jacques Hiblot X-Patchwork-Id: 1103979 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="eD7HVigG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 458mHx0SsCz9s9y for ; Thu, 23 May 2019 20:41:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4A387C21DED; Thu, 23 May 2019 10:39:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 623D9C21E8A; Thu, 23 May 2019 10:39:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 362ABC21E30; Thu, 23 May 2019 10:39:29 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by lists.denx.de (Postfix) with ESMTPS id ED054C21C2C for ; Thu, 23 May 2019 10:39:28 +0000 (UTC) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x4NAdOtu040338; Thu, 23 May 2019 05:39:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1558607964; bh=t2R/HvDchy3XeExCVzbA2SzEXsAqKWST4b8+9CQvIhQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=eD7HVigGieFhF9rUMUz0Doq0eRctQt4sN796hRGWhWARikkejs+YIns28k9qResuy qEnBJlcnuJlhMfkfrRndj5aCCg3kAMPWk3XvbYshww3UZbtfNUU0ak4WAE/Xm0cfQ1 0NgPlpTWwkhRmtja3XEjZyIgWk2C+CUBa3SuoXNc= Received: from DFLE107.ent.ti.com (dfle107.ent.ti.com [10.64.6.28]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x4NAdOkw039041 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 May 2019 05:39:24 -0500 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 23 May 2019 05:39:24 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Thu, 23 May 2019 05:39:24 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x4NAdN0l045963; Thu, 23 May 2019 05:39:23 -0500 From: Jean-Jacques Hiblot To: , , Date: Thu, 23 May 2019 12:39:04 +0200 Message-ID: <20190523103912.3790-5-jjhiblot@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523103912.3790-1-jjhiblot@ti.com> References: <20190523103912.3790-1-jjhiblot@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Cc: Marek Vasut , u-boot@lists.denx.de Subject: [U-Boot] [PATCH PATCH v3 04/12] spl: fit: Do not fail immediately if an overlay is not available X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If one overlay that must be applied cannot be found in the FIT, the current implementation stops applying the overlays. Let's make it skip only the failing overlay instead. Signed-off-by: Jean-Jacques Hiblot Reviewed-by: Simon Glass --- Changes in v3: None Changes in v2: None common/spl/spl_fit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index b521ee68e6..d5e3858ed0 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -315,9 +315,13 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, for (; ; index++) { node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, index); - if (node < 0) { + if (node == -E2BIG) { debug("%s: No additional FDT node\n", __func__); return 0; + } else if (node < 0) { + debug("%s: unable to find FDT node %d\n", __func__, + index); + continue; } image_info.load_addr = (ulong)tmpbuffer;