From patchwork Tue Apr 17 00:59:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 899003 X-Patchwork-Delegate: marek.vasut@gmail.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="oDzeeNwR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Q6Nz673cz9s1B for ; Tue, 17 Apr 2018 11:00:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 873B3C21E13; Tue, 17 Apr 2018 00:59:54 +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_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 610D2C21D56; Tue, 17 Apr 2018 00:59:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9BEE8C21C27; Tue, 17 Apr 2018 00:59:50 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id DDB1BC21C27 for ; Tue, 17 Apr 2018 00:59:49 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id q6so18677224wrd.6 for ; Mon, 16 Apr 2018 17:59:49 -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=vzDjclaT3Zc1eI0pJbM+MCmyKw3Pv4j3XKWZNYaKQAM=; b=oDzeeNwR/XaANBIKmsu6lEQg/ScokYIIKaDT7nqLpqKk4TWzti7px8wzZM6POL58XY uiQ+4Nx8r6aZNOhirx2DApJ4Kx6sak3muaRbAX2cGdwBhqQNQfRPqnl46HA6MuisQMh6 pPFNw8gmTTMnv0rz0+iV08P+JmX1z02TZ6JKl5t6YC3toZxhCT9782pXyQ4eOAW83Q7f 0OS5MOdCa1BYB+z94ioc/mEvuEFxhlM43hMhhA1R5gIbtDgwAgxglyhY9uJ8doe5aNdw XjcI3ODHrm9nhH3EYjXEPsnX8tNEhHKbMVfWDMdMDjw7GEBJLEksF/uwGc7yBMDO/m/d wBUw== 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=vzDjclaT3Zc1eI0pJbM+MCmyKw3Pv4j3XKWZNYaKQAM=; b=bSQ9xewe+qy46qFdc0emr2GUEMuHtf9CH0TQ/jksh4fGQrwzyR+tsb7pwnxjh8Omk5 9qyWgYsYoazjTH+kzKGNtuMp+J3Ogz1Qvu6ezZFKqMNGnTVk00+9JcSvTFpM4jl+yWb9 hMY98bHV0E3ft+C11dHXub0KiVCZ7f/rSGy8QuuyI/ISAUhjiIjeSCw3G/i8BrkRvM9A uOKaaFvtHeG65nQDhaht1mMHwm0z+xbYQ6PZcN9elYtjoohIt8qg/QbgeR2Pbu/38KGR /syKPhzyD29Fnm7F+RBClfAAdQJw6mH0wfeuw5rqog2ihDshrNeC7rF+NiV092PktiX5 6DBg== X-Gm-Message-State: ALQs6tC4IDsIPSCoJoO1kknUH+voCN12Yuas/ftwv+l1N6XePYHoQ8ek kE9i/PLJnmHnyxVwHBLQtBOrqDbd X-Google-Smtp-Source: AIpwx485el2sGmB6CKbz2k6qhO3KotCmX1rvya9tubiSzxPXRxwHDbyLDyyz7ArSq8/oes3+//m6fQ== X-Received: by 10.223.173.97 with SMTP id p88mr24458wrc.24.1523926789307; Mon, 16 Apr 2018 17:59:49 -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 u37sm7399957wrb.53.2018.04.16.17.59.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 17:59:48 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 17 Apr 2018 02:59:39 +0200 Message-Id: <20180417005940.12189-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 Cc: Marek Vasut Subject: [U-Boot] [PATCH 1/2] ARM: rmobile: Ignore U-Boot env when started via JTAG on Stout 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" When U-Boot is started via JTAG, ignore the installed environment as it may interfere with the recovery of the board. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- board/renesas/stout/stout.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index d7e81292a0..192ee66a38 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -128,3 +128,18 @@ int board_phy_config(struct phy_device *phydev) const struct rmobile_sysinfo sysinfo = { CONFIG_ARCH_RMOBILE_BOARD_STRING }; + +enum env_location env_get_location(enum env_operation op, int prio) +{ + const u32 load_magic = 0xb33fc0de; + + /* Block environment access if loaded using JTAG */ + if ((readl(CONFIG_SPL_TEXT_BASE + 0x24) == load_magic) && + (op != ENVOP_INIT)) + return ENVL_UNKNOWN; + + if (prio) + return ENVL_UNKNOWN; + + return ENVL_SPI_FLASH; +} From patchwork Tue Apr 17 00:59:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 899004 X-Patchwork-Delegate: marek.vasut@gmail.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="eQlsoI2g"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Q6Pd1FqXz9s1B for ; Tue, 17 Apr 2018 11:00:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CC6CCC21C3F; Tue, 17 Apr 2018 01:00:12 +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_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 A3896C21DFD; Tue, 17 Apr 2018 00:59:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2FC25C21C3F; Tue, 17 Apr 2018 00:59:52 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id BD9DBC21C27 for ; Tue, 17 Apr 2018 00:59:51 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id d19so30786003wre.1 for ; Mon, 16 Apr 2018 17:59:51 -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:in-reply-to:references; bh=VO8SLBJxv12Z4RTqJsyXFdc7xo0Lcnm8PMTRp0NMas8=; b=eQlsoI2gRsmIKTbr9atUS9YbgjbnnuiwM4Z3jHTVS3xkG7ErYbF5Vke8CBxf5gYxNk x0q4q4aUK0gLSewnJpVq5fkXIlHIHdxoRM7GidiOyVu8v6a30jSQU68vsNyN67mNR/go grijA0wt3CM05ADLnlGGxWdDYZ5aPh2Htrihz3HXpI9+Ra3Ke0wsKQwMNfmOblpzRoRg 6qS7qDoIb4pVWrMqWiHPJcBktDMaXmHeNQmuGahLZ37MDP1Df6BfW17dtSMx6IZ40wcD 8QLePOMFRUCRWP13MsD1XYZy6MJylrlXFJAw96/8lGgNDGG2C7QJ4DoGkme+NK154+rj BdQQ== 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=VO8SLBJxv12Z4RTqJsyXFdc7xo0Lcnm8PMTRp0NMas8=; b=dC5+7pjrWje0pFF0OSiI9QAElA2AMr/t3tRMhBW+3JH4fu5BTHxb/xKyhGiGbS2hio 1756/5wc9a8nBqpxAe9ewaryGyuJvGBJhHUVufRzy5ER/M5V5xPZ1aJ0HjpqbhsSh32f gAWI4ZIbthqVs4kmKzuQcgwsDlT4zOtlaSL3eweWVWxdWFnJagVR3YMb2quali/xYGmK +oFpDDQoAHe3iJmAQ0TX2+L6IiQVmuclVLZT8MUOWHef32jtsTyiOHnfhixadJ3WyJiq xR2QRL0NbLeEkY9n5/iLgFtFIY2y/qSGxFpaIxzKTsOMUmRQFO6MQ4DdNWKD8QVvp15C Cu+Q== X-Gm-Message-State: ALQs6tAVavaQFbMtVj98kd4rbTHTfCwX9X2MeTstHGPd7ULt8TN6YEeH sLDKDs/fuunHcAMbnwEO/+JPvOZG X-Google-Smtp-Source: AIpwx49CVgmySRvTjzASdYNs84irmwjAsuwgwDSrVRnr87WQYzCG8v1Nzth1VX4A9ObFOQToN+l6NA== X-Received: by 10.223.143.114 with SMTP id p105mr7204wrb.181.1523926791239; Mon, 16 Apr 2018 17:59:51 -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 u37sm7399957wrb.53.2018.04.16.17.59.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 17:59:50 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 17 Apr 2018 02:59:40 +0200 Message-Id: <20180417005940.12189-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180417005940.12189-1-marek.vasut+renesas@gmail.com> References: <20180417005940.12189-1-marek.vasut+renesas@gmail.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/2] ARM: rmobile: Ignore U-Boot env when started via JTAG on Porter 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" When U-Boot is started via JTAG, ignore the installed environment as it may interfere with the recovery of the board. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- board/renesas/porter/porter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index acd4f91d59..eb66bc903e 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -136,3 +137,18 @@ void reset_cpu(ulong addr) if (ret) hang(); } + +enum env_location env_get_location(enum env_operation op, int prio) +{ + const u32 load_magic = 0xb33fc0de; + + /* Block environment access if loaded using JTAG */ + if ((readl(CONFIG_SPL_TEXT_BASE + 0x24) == load_magic) && + (op != ENVOP_INIT)) + return ENVL_UNKNOWN; + + if (prio) + return ENVL_UNKNOWN; + + return ENVL_SPI_FLASH; +}