From patchwork Mon Sep 4 20:12:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pantelis Antoniou X-Patchwork-Id: 809829 X-Patchwork-Delegate: sjg@chromium.org 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="Sn9yRHia"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xmLk35p0tz9t2R for ; Tue, 5 Sep 2017 06:17:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 84EFCC21F29; Mon, 4 Sep 2017 20:13:47 +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=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 54E89C21E52; Mon, 4 Sep 2017 20:13:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 72C7AC21EEC; Mon, 4 Sep 2017 20:13:07 +0000 (UTC) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by lists.denx.de (Postfix) with ESMTPS id 3387CC21F12 for ; Mon, 4 Sep 2017 20:13:03 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id 187so8638499wmn.1 for ; Mon, 04 Sep 2017 13:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mvRNxsnik3lUCFAdGOOkgNqvl01RIMt/dBuIE83a+rY=; b=Sn9yRHiadLeprEYnzBXOVjhBN6ZQFTsYEO5xJUga/kODSqxg1vMdaQ+UJ3lGZSfXyt 8PWFqsTqo2SuyGLSsIdAHGc0KHEEpJgm/fFFQxUq7SVFTLfCjR3JzWo3DDNzfPqUq3jq +DSinsxQV9k45x2ikNLM6Euz4zxJ106/qB+nE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mvRNxsnik3lUCFAdGOOkgNqvl01RIMt/dBuIE83a+rY=; b=GQ+NXRhx4zdR4tR+nkB4b028tYjN68aW03khIeC+74mLgcay1dleYWpWbv45lJSSi/ lkWf3ywGKlTQBWqzFP/dcI407lO8Dsmw0l1PC0B9R1FIhs3a/aM0OO8dVgj9xBhiOnDV 5vlimQPvAnGstlfjtuVz+PttIKsYEwUzUC+m1TFtEJH5srGfsudqEH906Iy6ozxfR2dB h5FyPLLurPF+DnpqErm05a1XiOLJWJh1rPtgCAeWw7xTePjj+MRvr5PiKR+8GjjjKXbE ZmbOneBgyV8derQraTZ40s+JbrfbjyUS6gnpe4rK65FD2t/BYh9L8tVzI7dehphtFeQE /Ofg== X-Gm-Message-State: AHPjjUipQbaUCDIvTuEFY+Q/wZzaypG8eDLMxHX942MB1g/HN3rd82Ae aWMKOTGzoj8FyTin X-Google-Smtp-Source: ADKCNb5PRrTPJUATFTSoDJ4I9bSfGgAplEPsT1laMbl5oN26xVI6Rh1OitVmNn0bZTvNzF/yK8tMFg== X-Received: by 10.28.69.15 with SMTP id s15mr815581wma.118.1504555982882; Mon, 04 Sep 2017 13:13:02 -0700 (PDT) Received: from localhost.localdomain ([195.97.110.117]) by smtp.gmail.com with ESMTPSA id u8sm3720435wrc.92.2017.09.04.13.13.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Sep 2017 13:13:02 -0700 (PDT) From: Pantelis Antoniou To: Tom Rini Date: Mon, 4 Sep 2017 23:12:15 +0300 Message-Id: <1504555943-12893-7-git-send-email-pantelis.antoniou@konsulko.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1504555943-12893-1-git-send-email-pantelis.antoniou@konsulko.com> References: <1504555943-12893-1-git-send-email-pantelis.antoniou@konsulko.com> Cc: Marek Vasut , Pantelis Antoniou , Tero Kristo , u-boot@lists.denx.de, Maxime Ripard , Stefan Roese , Alan Ott Subject: [U-Boot] [PATCH v3 06/14] fit: Do not throw away extra configuration on fit_image_load() 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" fit_image_load() threw away the extra configuration parts when loading. We need them around for applying extra overlays for building the boot fdt. Signed-off-by: Pantelis Antoniou Acked-by: Simon Glass Acked-by: Simon Glass --- common/image-fit.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index 74e5557..e75cb64 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1653,6 +1653,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, int cfg_noffset, noffset; const char *fit_uname; const char *fit_uname_config; + const char *fit_base_uname_config; const void *fit; const void *buf; size_t size; @@ -1668,6 +1669,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, fit = map_sysmem(addr, 0); fit_uname = fit_unamep ? *fit_unamep : NULL; fit_uname_config = fit_uname_configp ? *fit_uname_configp : NULL; + fit_base_uname_config = NULL; prop_name = fit_get_image_type_property(image_type); printf("## Loading %s from FIT Image at %08lx ...\n", prop_name, addr); @@ -1701,11 +1703,11 @@ int fit_image_load(bootm_headers_t *images, ulong addr, BOOTSTAGE_SUB_NO_UNIT_NAME); return -ENOENT; } - fit_uname_config = fdt_get_name(fit, cfg_noffset, NULL); - printf(" Using '%s' configuration\n", fit_uname_config); + fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL); + printf(" Using '%s' configuration\n", fit_base_uname_config); if (image_type == IH_TYPE_KERNEL) { /* Remember (and possibly verify) this config */ - images->fit_uname_cfg = fit_uname_config; + images->fit_uname_cfg = fit_base_uname_config; if (IMAGE_ENABLE_VERIFY && images->verify) { puts(" Verifying Hash Integrity ... "); if (fit_config_verify(fit, cfg_noffset)) { @@ -1861,7 +1863,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr, if (fit_unamep) *fit_unamep = (char *)fit_uname; if (fit_uname_configp) - *fit_uname_configp = (char *)fit_uname_config; + *fit_uname_configp = (char *)(fit_uname_config ? : + fit_base_uname_config); return noffset; }