From patchwork Thu Aug 16 23:30:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 958607 X-Patchwork-Delegate: sr@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=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="ponqDBj2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41s2f13btCz9s47 for ; Fri, 17 Aug 2018 09:31:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2F4ABC21DE8; Thu, 16 Aug 2018 23:31:18 +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_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 039B5C21C57; Thu, 16 Aug 2018 23:31:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9F98DC21C57; Thu, 16 Aug 2018 23:31:14 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id 0AC10C21C38 for ; Thu, 16 Aug 2018 23:31:14 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id a11-v6so2746605pgw.6 for ; Thu, 16 Aug 2018 16:31:13 -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=n95ojjMo0oOQUo3YhjjbOwFNCIPiacuL0jU/MCl8OAE=; b=ponqDBj2V0KnxEq/nSkH8xxpboCPhnBfG0DK/CiCPAhJkx7KVEHYWkXlF5LOrZ/X98 Vf24lkJJimHqKE4I7NlXPdkVvjJHQAMFk0WEvgaUJgmjIGlDo2ya2d6j8bmgbIMkWol5 8twanNIx4Kq64/zOy7R00zPMRZhZ9pY0vtTNApC/erigetcA0/917vj4YV7zQWhGS4aI e2Y4b+R70oMzB5ubZeObfjvMcjIOGOASGJJh8CWfap1WPRdpHkcMpguTyjpsShkwFNis ohFFXcSN2GJJ3Z5rIUBW1nwKgwN7EDrYTfn7Yun7f8gQKoqBYAhg2j2aqngBKkz2YEU9 +hXw== 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=n95ojjMo0oOQUo3YhjjbOwFNCIPiacuL0jU/MCl8OAE=; b=k6nzk7AmCWetDwvCVDXf+5MCvgt2Dg3bMgwlVnMnzgXXxyg4qv00pO3ogPtkxrLBoB 6jy+0yAZSm1NMLjq3vDZb9Eix/B6uQJXcfXQxoQ0ZTo/q6YOoZb7QS+zPucP+sEqRJ+N p9lH5F5jF5mwI8cEmZba+4+d1LbViFD7wmNUOJPJ0vnWq2LpdVKuoC3jZ7UEP2STY/XX 47PCpV57ovcEBfWrNS7CYWRLVdKjTj0CjN5HmsGapiUaLfFkhfUeFIxoUUKEv6X4qxiw rT6DsSsAm5b/QtMR2jYwv+nQ8Xsd3hAZsYdkmBVdsgElenMNF9MeCjlaYZ4QG1ETwkWL 0tZA== X-Gm-Message-State: AOUpUlEy/AOlDQSvjcVTa3RAx89YfsmF4Qxvv7iIJCpsHY9Sw/QDEOMK mR7wjg2P9wkwJin6+mDbedAtHov6JM4= X-Google-Smtp-Source: AA+uWPxvd28R/0LK8b01PCP4Vm4brOFJWxPh3fVyoIuFmKhZO3i6hPIqkPoVE1xdpYHoTLcOm3k1UQ== X-Received: by 2002:a63:e949:: with SMTP id q9-v6mr30768723pgj.4.1534462272249; Thu, 16 Aug 2018 16:31:12 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id m30-v6sm401048pff.121.2018.08.16.16.31.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Aug 2018 16:31:11 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 17 Aug 2018 11:30:56 +1200 Message-Id: <20180816233056.25663-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.18.0 Cc: Baruch Siach , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH] Revert "arm: mvebu: fix boot from UART when in fallback mode" 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 reverts commit e83e2b390038c9075642cb243a6292241beb8d73. This prevents kwboot from overriding the hardware strapped boot source. Signed-off-by: Chris Packham --- Sean, I take it your use case was for when the default boot source doesn't have a valid image and it falls back to UART? If that's the case I think we need something in addition to the existing code not instead of. arch/arm/mach-mvebu/include/mach/soc.h | 6 ------ arch/arm/mach-mvebu/spl.c | 9 --------- 2 files changed, 15 deletions(-) diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 623ab4eb8d93..660dd148abc5 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -110,16 +110,10 @@ #define COMPHY_REFCLK_ALIGNMENT (MVEBU_REGISTER(0x182f8)) /* BootROM error register (also includes some status infos) */ -#if defined(CONFIG_ARMADA_38X) -#define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) -#define BOOTROM_ERR_MODE_OFFS 0 -#define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS) -#else #define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) #define BOOTROM_ERR_MODE_OFFS 28 #define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS) #define BOOTROM_ERR_MODE_UART 0x6 -#endif #if defined(CONFIG_ARMADA_375) /* SAR values for Armada 375 */ diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 50b24f5760b7..4c3933b8354d 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -25,16 +25,7 @@ static u32 get_boot_device(void) val = readl(CONFIG_BOOTROM_ERR_REG); boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS; debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device); -#if defined(CONFIG_ARMADA_38X) - /* - * If the bootrom error register contains any else than zeros - * in the first 8 bits it's an error condition. And in that case - * try to boot from UART. - */ - if (boot_device) -#else if (boot_device == BOOTROM_ERR_MODE_UART) -#endif return BOOT_DEVICE_UART; /*