From patchwork Tue Sep 29 12:34:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1373368 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V1Ft5l4V; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C0zNb2G8yz9sX0 for ; Tue, 29 Sep 2020 22:34:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4DCD82332; Tue, 29 Sep 2020 14:34:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V1Ft5l4V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AE92F8233E; Tue, 29 Sep 2020 14:34:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E10288219C for ; Tue, 29 Sep 2020 14:34:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=a.heider@gmail.com Received: by mail-wm1-x344.google.com with SMTP id v12so4609200wmh.3 for ; Tue, 29 Sep 2020 05:34:28 -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=Y1HNh119zt3m6y4jcvotbkKan00HpqXyGeu5Xdmm9qA=; b=V1Ft5l4VTWDlu70LQvwpFSKzrhBLOC/0/j0iFiZsHgBQewYb7ftFoGx7+RiOeZBh9V SRU35nGkLZ+VizS+NpjOijr8HtyZe++9HbjzqK/VANFb7l8scih0nCLVHl3+KI0ozfGm mX0F/QTmELxqVbazJ8eGdBCPC0Vfn+Qnf2iTnDg8jdeTGIGu7iLSF7Hi04ZCgarOVpt8 3LQb/f5OtmhvU64YRIP416hFO/rahuMIAuB8xknWpsEZfDlxBqk3dSPhW0sI1Nnh7pME IU89I79n0c9JgGKr7qvrYY87ZW+qki9WCYt8PGhP+we5NXb+K27LFvuUb77uOw0PvtW+ 7yuw== 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=Y1HNh119zt3m6y4jcvotbkKan00HpqXyGeu5Xdmm9qA=; b=k5nhxr23IjbC4/dZt20Wz4iEQI94cHO83+KNIPXhcIKnT7Kahj3w98jetEXHK6X+e3 6sizR/lu/Nk2ZQHOjxSnyND1YSjIbFRviPtFGguXnFZR05MVtKPpBBYWPOn8++tTYMmr HhKCWxhIF7o/q2QihhbaZiQ6Qq0dqxt7aqUPAnNDQHmOoFK/NqCpnETFF6C8YMB3GKzi NK4xECQz4LzDuQ+lk/yrdRDR3BkSj9ewXGguL4NdJ/I+Zeo57nOTHjJIz7wVOmZcq0ik 8iep5F6x8f4LpiJJreOspdoCZHl7Eesg76+6wcoBYo8GgF+Ynrnii4n3DGKj2rg2+yQe WNdA== X-Gm-Message-State: AOAM532S7RUFUEQ7eNlc9+e+aDl5jP6qNoBC3Cjl51Nzy6mtD9i6k4/U Xa9BBZPDPH4riuZGfotD9Qc= X-Google-Smtp-Source: ABdhPJz5gGks9103ob0Ir6xYVxkzyshw8wj4vXIh3jKcDehtsyklMU5TizFbba94LTa9Yr+aj+7rdw== X-Received: by 2002:a1c:1f08:: with SMTP id f8mr4335589wmf.168.1601382868506; Tue, 29 Sep 2020 05:34:28 -0700 (PDT) Received: from mamamia.internal (a89-183-18-125.net-htp.de. [89.183.18.125]) by smtp.gmail.com with ESMTPSA id x10sm5468307wmi.37.2020.09.29.05.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 05:34:27 -0700 (PDT) From: Andre Heider To: Stefan Roese , Konstantin Porotchkin Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , u-boot@lists.denx.de Subject: [PATCH] arm: mvebu: Espressobin: Fix checks against machine compatible strings Date: Tue, 29 Sep 2020 14:34:26 +0200 Message-Id: <20200929123426.15346-1-a.heider@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones. Reported-by: Pali Rohár Signed-off-by: Andre Heider Reviewed-by: Pali Rohár --- board/Marvell/mvebu_armada-37xx/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index eacee15cb3..2bfc7171c4 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -88,14 +88,14 @@ int board_late_init(void) if (env_get("fdtfile")) return 0; - if (!of_machine_is_compatible("globalscale,espressobin")) + if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) return 0; /* If the memory controller has been configured for DDR4, we're running on v7 */ ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS) & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4; - emmc = of_machine_is_compatible("globalscale,espressobin-emmc"); + emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc"); if (ddr4 && emmc) env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");