From patchwork Wed Aug 30 22:13:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Nelson X-Patchwork-Id: 807934 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="aYm5BNEV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xjKZd39LSz9s81 for ; Thu, 31 Aug 2017 08:15:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B40DEC21D55; Wed, 30 Aug 2017 22:15:25 +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_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 12A19C21C27; Wed, 30 Aug 2017 22:15:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4A37EC21C27; Wed, 30 Aug 2017 22:15:21 +0000 (UTC) Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by lists.denx.de (Postfix) with ESMTPS id 91DE5C21C26 for ; Wed, 30 Aug 2017 22:15:20 +0000 (UTC) Received: by mail-pf0-f180.google.com with SMTP id r187so2250520pfr.3 for ; Wed, 30 Aug 2017 15:15:20 -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=aYm5BNEVALGxi+6f0/OWmzk2jCxXgT2xJJo9LJQfl4CjKqQ7Lta6567M7sx5cyUCfh EBFIQeXVp147E0/11PhM3fpOIirn4f406HxFokNpOz6OG+1rtKBVEwKTdDB7FCFS9w11 oWM10B1r0P4cj8FsKHgHb7kWFYYd2YltYofuU= 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=N2VEo/viIbtkDsqMKVf1Z1DKDU5NQVPKco8nJ/y0LcHKPt4FhiVojeOvkhRxwq/51Y M8BPXrtPFFJKDtsg92EZ59jqxaltnrakVmLWEYSpkv2urD6AuTQS8KtO3fnsemMIUO9o WuxGoH1had3p2TqWcJvO9pL7cSqhEdsDFOyzM3YEMd9M+6bDdh4gs0E6Ikbk4/QP+NY3 bXA/Kvejin+EnEWUqK5QV83v5DaG0C0T/aRLD1Ig8289l+dPnxgo1QZscK8nRFkIHxYg oC2xIvLzY/SrZ73sIRVKtQyUvH1GchNcUqTxQxxuZS5zEhT4ghbnIfHBb7DYMmrtZEA7 1yeA== X-Gm-Message-State: AHYfb5jQjVJ/aAwCE2ITEpB/scMDkhlSEX1oB46Pp2ArmYTUiL5JWULN SO+CujqBJwd/Qlg5BWo= X-Received: by 10.98.7.138 with SMTP id 10mr95471pfh.258.1504131318509; Wed, 30 Aug 2017 15:15:18 -0700 (PDT) Received: from localhost.localdomain ([2600:8800:1300:1c00:a894:22d2:29ef:3774]) by smtp.gmail.com with ESMTPSA id a14sm3171315pgn.76.2017.08.30.15.15.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 15:15:17 -0700 (PDT) From: Eric Nelson To: u-boot@lists.denx.de Date: Wed, 30 Aug 2017 15:13:14 -0700 Message-Id: <1504131194-24902-1-git-send-email-eric@nelint.com> X-Mailer: git-send-email 2.7.4 Cc: stefan.agner@toradex.com, adrian.alonso@nxp.com, vanessa.maegima@nxp.com, 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)},