From patchwork Wed Aug 30 14:13:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Nelson X-Patchwork-Id: 807654 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; dkim=fail reason="key not found in DNS" (0-bit key; secure) header.d=nelint.com header.i=@nelint.com header.b="XORjTEpM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xj6ws0bsLz9s8J for ; Thu, 31 Aug 2017 00:15:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BA908C228A1; Wed, 30 Aug 2017 14:15:37 +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 4FEE2C2292F; Wed, 30 Aug 2017 14:15:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 01236C2292F; Wed, 30 Aug 2017 14:15:33 +0000 (UTC) Received: from mail-pg0-f54.google.com (mail-pg0-f54.google.com [74.125.83.54]) by lists.denx.de (Postfix) with ESMTPS id 5F604C228FF for ; Wed, 30 Aug 2017 14:15:33 +0000 (UTC) Received: by mail-pg0-f54.google.com with SMTP id t193so3396930pgc.1 for ; Wed, 30 Aug 2017 07:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nelint.com; s=google; h=from:to:cc:subject:date:message-id; bh=Rf3xfHf6/BM9ti3sQQ9IOJsQWruQEfeyZKQChWfgefQ=; b=XORjTEpM8jw7bD32vMuyDuj435mKJO8CRAm2rY38vgMUrOxWo2fQ4YaFAuK0fZtwF2 26wTDLMe01Ww8voL1ryQrMwhjhImDq5yVSyD1U8YII4oxrQzIv5lYz6XsCSKsCHRAI9M knHUfPEAViSr29WCG/85PJk1CHzWCq0DmFWuY= 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=Rf3xfHf6/BM9ti3sQQ9IOJsQWruQEfeyZKQChWfgefQ=; b=ODJzCkvV3IfttbbHhryCpZyppBOl7VrO1blDjYfOolEjTUwQP2HcS5wekc08wFGAJa AlgJfjqpjD8HCJqzyLT4LR+UYYTvXoBKv7qwLX3oaAl5eqrhtWWfBe8Ap6nLQBLzNuO0 /u/mpDhGEeiU6oVhAPRVeM6RzpaNYhf0ZhrwLwprnw8pnykWWKUi+Mvsg0cs+b/UA1j+ cF8gIp5Vh+5rQ4c8a/RGJMvpkvefqv2q6lazA6TQTNIh2Tfs7GCydMmMF4NtuqwNbz4e V5z47Iou51gU//mmvdaGJhAoO+6/oJTUVhGH57dr+HY5iX6jlGXIcPJeWezECq5NkkCe qJYA== X-Gm-Message-State: AHYfb5jtyJb7cNPJ92onOnlDwOWg+ONY9/kMa1yQjgr38Jje5fWYhDB0 Zk5nn0KyPOmi4ZqBQm0= X-Received: by 10.84.225.129 with SMTP id u1mr2158638plj.354.1504102531657; Wed, 30 Aug 2017 07:15:31 -0700 (PDT) Received: from localhost.localdomain ([2600:8800:1300:1c00:a894:22d2:29ef:3774]) by smtp.gmail.com with ESMTPSA id y129sm2565660pgb.16.2017.08.30.07.15.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 07:15:31 -0700 (PDT) From: Eric Nelson To: u-boot@lists.denx.de Date: Wed, 30 Aug 2017 07:13:28 -0700 Message-Id: <1504102408-4846-1-git-send-email-eric@nelint.com> X-Mailer: git-send-email 2.7.4 Cc: albert.u.boot@aribaud.net, fabio.estevam@nxp.com Subject: [U-Boot] [PATCH V2] imx: mx7: Add support for USB and normal boot modes 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" This adds support for two additional boot modes on the i.MX7D SoC, which is most useful when doing U-Boot development on this chip. 1. "bmode usb" can be used to force the ROM boot loader's serial 2. "bmode normal" can be used to revert to the normal boot mode as specified by fuses and BOOT_MODE pins Signed-off-by: Eric Nelson --- V2 adds "normal" mode as suggested by Troy Kisky arch/arm/mach-imx/mx7/soc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 87bf105..15be42a 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -372,6 +372,9 @@ void set_wdog_reset(struct wdog_regs *wdog) * to SBMR1, which will determine the boot device. */ const struct boot_mode soc_boot_modes[] = { + {"normal", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)}, + {"usb", MAKE_CFGVAL(0x01, 0x00, 0x00, 0x00)}, + {"ecspi1:0", MAKE_CFGVAL(0x00, 0x60, 0x00, 0x00)}, {"ecspi1:1", MAKE_CFGVAL(0x40, 0x62, 0x00, 0x00)}, {"ecspi1:2", MAKE_CFGVAL(0x80, 0x64, 0x00, 0x00)},