From patchwork Mon Apr 16 20:44:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 898935 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O/7EBcsW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Q0kf3Qykz9s0R for ; Tue, 17 Apr 2018 06:45:14 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1AE20C21E6C; Mon, 16 Apr 2018 20:45:11 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 C3581C21DAF; Mon, 16 Apr 2018 20:45:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E018C21C27; Mon, 16 Apr 2018 20:45:07 +0000 (UTC) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by lists.denx.de (Postfix) with ESMTPS id B0B72C21DAF for ; Mon, 16 Apr 2018 20:45:06 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id v24so12576007wra.8 for ; Mon, 16 Apr 2018 13:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=OVBqO7o+06KPvhQNulokO6NclDvdeuJTjR917gRf9Os=; b=O/7EBcsW0VqW1Ta/qcQAWIAMTMwKqnUsf4oz++6eIk/ujvV5amjlWdCyCEi9YNrF/n jsLfme0cg+p3C36Dn4GM0UiZCYx1IDoBRLdHS3MSojQPKf/F2NVlg83YHSyBrYcEmOEF uiue2EynWWc9/qJ8aU+/8pUjGLqESb9nSvgwYvsq3RKjwQADpMjbSCSsF+h72glGnEGM 0kKCaHA91T7B+ECsFXYiyYEZqCqXjpXVK5K2ymxA/gh7lo2Im+BttpaRQg0mGxenViKY duKDegbKm+9sZyYrpuREAnULOeI/whaWlp1gOQQwOH6Zjvw1C/memM3d4vXpp92eYVBR mvhg== 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; bh=OVBqO7o+06KPvhQNulokO6NclDvdeuJTjR917gRf9Os=; b=rHu26t2JJtOGis8XMTNaolXgh8US39l/ucArKLDfauB52cUKnnEiZ5WdQvY1B+WLjb /QkTZGwV1wyvUz8M1z3ellmzmGBwMSKc6YgjlCgvMHjA6bQuRk6g+NLkhS21kxak0OGw sqkVodmhwY100mcKARwii9lyH0XdNLcv+kjmpNOmbObVhYzFqCFVdFe+ScJX3ueK7CAR x2pF2M/QX5h3EB0GXC/KQT2toQSQAplH6Rm8iSx2mChAE2vNMlwR5hQqlsAPDomydlo7 SizioXVsTIWWLWJ9K4/yWqJROHLsLeURtlexT8gVQ1sp2quVVi29VlioABugiuDqbPV7 hGDg== X-Gm-Message-State: ALQs6tBSQOBTorBdl4OboXlUgP4YZt9iTP6uBHrJMxN04d7v3BeHvFLd 2frji2ZzbD2fDXvDQY7ElX785zP/ X-Google-Smtp-Source: AIpwx48mR1OfMJI3/mrS1cUzWLt2hlX2O3HpR/V6Z+T+mEvdU0coceUv5xgk5zxxcyEAAmIP/73oQw== X-Received: by 10.28.143.199 with SMTP id r190mr10603285wmd.132.1523911506106; Mon, 16 Apr 2018 13:45:06 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id 4sm4425236wrz.58.2018.04.16.13.45.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 13:45:05 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Mon, 16 Apr 2018 22:44:50 +0200 Message-Id: <20180416204452.10906-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 Cc: Tom Rini , Marek Vasut Subject: [U-Boot] [PATCH 1/3] common: Let board decide if env should be loaded 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" Add board_should_load_env() hook which lets board code decide whether environment should be loaded. This is useful when restoring the board over ie. JTAG where the environment may interfere and where it may be desired to ignore the environment present on the board. The return value of board_should_load_env() is: 0 - do not load environment 1 - load environment -EAGAIN - default behavior Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Cc: Tom Rini --- common/board_r.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/board_r.c b/common/board_r.c index 0f4479a58b..8b68140b57 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -438,8 +438,17 @@ static int initr_mmc(void) * * @return 0 if environment should not be loaded, !=0 if it is ok to load */ +__weak int board_should_load_env(void) +{ + return -EAGAIN; +} + static int should_load_env(void) { + int ret = board_should_load_env(); + + if (ret >= 0) + return ret; #ifdef CONFIG_OF_CONTROL return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1); #elif defined CONFIG_DELAY_ENVIRONMENT