From patchwork Wed May 8 18:14:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097177 X-Patchwork-Delegate: sbabic@denx.de 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=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ciI6jYrd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl5x15lLz9s5c for ; Thu, 9 May 2019 04:16:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AAB06C21DB5; Wed, 8 May 2019 18:15:39 +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_MSPIKE_H2, 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 EC331C21DA1; Wed, 8 May 2019 18:15:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C38DFC21E0F; Wed, 8 May 2019 18:15:14 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 98B15C21DD7 for ; Wed, 8 May 2019 18:15:11 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id p27so8015138eda.1 for ; Wed, 08 May 2019 11:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ShjRkvkuQ5uFewwbjOFScm+Le/kwoYSXA1NnhyyLpKU=; b=ciI6jYrd1l5L1yr2Rbr36+gyrWMP0WM5LSL7bFXb9D6k/Wy3hUULEvOW+PuB8jRtq2 T+LEWwI6ztIfhFQyrtl5YRA09sBOC8wM2huMSQGOi8ukTdK5FrUdN+iZo2afSdS6xl7/ WEGxxZb/OM9cUf3P5uYGbpN9FYg1kS4byLgOZWjF+NldWJmqCIoK58hLqVk82jArME67 IQGFJbMhZFezyn2kgQwQZj54RAVTXbeMvAl7C/yELDClXSoXw9rDCFv3KnsZ1d1e/EId EokWuzX2nH+DRIRKsQtg28apulX7ZykDaJnlQ7jllizsM+RjwhxZVxcaX+FnZ9znXd4h KGsw== 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:mime-version:content-transfer-encoding; bh=ShjRkvkuQ5uFewwbjOFScm+Le/kwoYSXA1NnhyyLpKU=; b=rchwRpHKIk+Hz0XLiJRq8rECkiWYqoLxc+1h6M+2Tq/A1yLzcajgIJR0oclQxEpgvw 9cJdKv8ly6NiDWAeCK3qxcyhiTtGaE4RWp/OL80KOS5hQgsAkGG7edtm7f3tWJ3PmwBi +agdGchgMDA/zaL1LtKcybK6nODyw1c/3YjskGDxENXYUQbzGbhBOTt9ddUhiaLRaHaf FDdBvhn0ggilky/ClfeDopKpTKYLIBAGdUDURHTvlySZZLZR7v2qeBZ2YjwLSzXoaUSX MjA4oBFaI8pTc6cQ+JHkinVTWlzyPPyD869HjOERnmbpzih4zrhcbPjU6pWyoh4/ULOv pDBA== X-Gm-Message-State: APjAAAVM/HeQkrk30w71lAxZ/m1F90FdWkT1JUTDErQQRgQAWkuakAOe wVC0CaiAUH37MmdUs9Idnnelymqkyvo= X-Google-Smtp-Source: APXvYqzfRfEV3owKaRUK4Iy5Lvx+YcuelgB2hgIhDNPZzwIZdZYc4BoxVkhjUsNiAQmPe6+5kKAbcg== X-Received: by 2002:a50:929a:: with SMTP id k26mr41315840eda.52.1557339310918; Wed, 08 May 2019 11:15:10 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:10 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:43 +0100 Message-Id: <20190508181448.20452-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 2/7] warp7: include: configs: Specify image name of bootscript in FIT 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" When obtaining the bootscript from a FIT image we need to specify the name of the bootscript as defined inside of the FIT. This patch makes a define that appends a "bootscr" parameter to the source command when compiling up in FIT mode on warp7. An environment variable is supplied to enable others to use a different name than "bootscr" as the image name of the boot script in their FIT. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 0ef8e35948..95955fd626 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -38,9 +38,17 @@ #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \ +/* When booting with FIT specify the node entry containing boot.scr */ +#if defined(CONFIG_FIT) +#define BOOT_SCR_STRING "source ${bootscriptaddr}:${bootscr_fitimage_name}\0" +#else +#define BOOT_SCR_STRING "source ${bootscriptaddr}\0" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ + "bootscr_fitimage_name=bootscr\0" \ "script_signed=boot.scr.imx-signed\0" \ "image=zImage\0" \ "console=ttymxc0\0" \