From patchwork Wed Jul 10 20:09:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1130553 X-Patchwork-Delegate: simon.k.r.goldschmidt@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="pDm5Jr6j"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45kVdl5NRDz9sBt for ; Thu, 11 Jul 2019 06:09:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 67890C21DDC; Wed, 10 Jul 2019 20:09:27 +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 3C524C21C3F; Wed, 10 Jul 2019 20:09:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 83B22C21C3F; Wed, 10 Jul 2019 20:09:23 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 29481C21C51 for ; Wed, 10 Jul 2019 20:09:23 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id f9so3737642wre.12 for ; Wed, 10 Jul 2019 13:09:23 -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:mime-version :content-transfer-encoding; bh=/xkIU1G9f9b7zFIFrWb+EDyJugn/saJdqelLRfcExMw=; b=pDm5Jr6jQRXl7g8XIy0VxnQcvg6CkFVyted4ra79iGMINF3m6caAOaipd6+1ehB/2e N/JW6HmOFJ8L3pcfq0h0Abnc4u4Hd+/DqaFlin54y4JKYJQJ+xJrp8qxpszIcJ6PWmDF J/tFs79SPHm3VJVtNIGqRL6OBu3YVIX6fxxEfinyvaLgKtw+7OkAOe9Y4jL1QPvHO1AQ E+HI2+/SSzie9RI0J6ltHcC+DfYsu4LbIKOh9FyORDb0ls9S06DxhG6AVRzmUyfOd/iy lT853Bj6jsRk9CfMhAcQcDLeG6EWMvLL8+z2K7tJtvYPQnM0CNepNk3CJHU/yO0XxqI+ ZpIQ== 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:mime-version :content-transfer-encoding; bh=/xkIU1G9f9b7zFIFrWb+EDyJugn/saJdqelLRfcExMw=; b=ZkFs/NzV7OG/aqPvOrRM/lYWn5uKxFWLn191+V7OKdXPRxKACk1PM3C6eZ90Vu5RKO tjM5jLDqFLRtkr7aTone7eM9sYb638yiXKFVNTrlR6z8y98FBVP6h7uToQRj9N8i4Ece a1ZJYwK3PiAa16vP3HZmC1P3VmnESnuHoUNL1ORraOq5UA6qqDdkBhP6+hXkeohpuYJI oUKo+VKkoTL7Gv5iNxUlOh09NWIMtKybEjcKm3AEw0vkTK4gZSEOb7QdryvTSzNn9RhJ Oz3MGflyw8sfD6I9ABeUxV/UJV6rUSMvU+PE5P+PBgshoBCKKUBhQHuB8RXblmVUavNO yidw== X-Gm-Message-State: APjAAAV/BpN4zIHDvgXMRKpi9orYJPypFlMrvPV20Wf88WodWHhJxu15 de6HN7e9ZegGgCyqfcnExV8= X-Google-Smtp-Source: APXvYqxjQKnDnykgz27PfT+Gaql+aGfmewTr9+1fYU6Pz67xdTE/WoDP5IsecqbRPrvKsYBnAS5+3w== X-Received: by 2002:adf:ef49:: with SMTP id c9mr26430636wrp.188.1562789362845; Wed, 10 Jul 2019 13:09:22 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:e1af:5c69:a16b:945c]) by smtp.gmail.com with ESMTPSA id b8sm3587525wmh.46.2019.07.10.13.09.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 10 Jul 2019 13:09:22 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut Date: Wed, 10 Jul 2019 22:09:14 +0200 Message-Id: <20190710200914.15857-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: Chin-Liang See , Tom Rini , u-boot@lists.denx.de, Dinh Nguyen Subject: [U-Boot] [PATCH v2] arm: socfpga: fix 3 boards missing env var "socfpga_legacy_reset_compat" 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This fixes 3 boards that don't use CONFIG_EXTRA_ENV_SETTINGS from socfpga_common.h. They need to enable reset manager compatibility mode unless all peripheral drivers in Linux support reset handling. Fixes: commit 4b2e32efa4e7 ("arm: socfpga: gen5: deassert peripheral reset by default") Signed-off-by: Simon Goldschmidt Reported-by: Wolfgang Grandegger --- Changes in v2: - drop trailing backslash in socfpga_vining_fpga.h include/configs/socfpga_dbm_soc1.h | 3 ++- include/configs/socfpga_stratix10_socdk.h | 3 ++- include/configs/socfpga_vining_fpga.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index b36d7e56fb..fc1db2442e 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -87,7 +87,8 @@ "echo Running bootscript... ; " \ "source ${kernel_addr_r} ; " \ "fi ; " \ - "fi\0" + "fi\0" \ + "socfpga_legacy_reset_compat=1\0" /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 8d2971c6e2..90ad8172e2 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -113,7 +113,8 @@ unsigned int cm_get_qspi_controller_clk_hz(void); "scriptaddr=0x02100000\0" \ "scriptfile=u-boot.scr\0" \ "fatscript=if fatload mmc 0:1 ${scriptaddr} ${scriptfile};" \ - "then source ${scriptaddr}; fi\0" + "then source ${scriptaddr}; fi\0" \ + "socfpga_legacy_reset_compat=1\0" /* * Generic Interrupt Controller Definitions diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 29a92b9146..5416c4b170 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -145,6 +145,7 @@ "run ubi_ubi ; " \ "else echo \"Unsupported boot mode: \"${bootmode} ; " \ "fi\0" \ + "socfpga_legacy_reset_compat=1\0" #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE