From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 05 Nov 2021 13:23:43 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1miyFz-0001lp-7e for lore@lore.pengutronix.de; Fri, 05 Nov 2021 13:23:43 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1miyFy-0000Kg-9s for lore@pengutronix.de; Fri, 05 Nov 2021 13:23:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FIhPimYT7Z8F8zIrLmjd9EBWkiS9hjSiYFVRQRHSfQ0=; b=hlD1T5LzxR09qm jlxYSwk1q7R/d2BuBPX1XRPLJnQyDE9J7z+Dq0ONTlg2lMy0hF9KTP5DvX4/m2lIIS6V/h2IPNy46 N6LypWbgFR/bIVPfFlGxWJAov742Un6ADEDqMAwcrLgF2Y01HD9rjubyrCTsGPHyqH6YAJG8eaOQT 3CwCGVkW22umJ04d547KeZ4gZZPgvTiRYrtZuTBkoDmcu3zjm+o2hO2121m/pLtBH5tP+YSnAMtSj I0qhfSw3WBnaTbGphnQlXYC4FLCy3zI9yYENU41ckNhoUjE7gYdSGwiDbxGlULEm1C/EBkhHKD4Ii PH+xPlwZe8OD0bpxH3/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miyEZ-00BFGJ-Jp; Fri, 05 Nov 2021 12:22:15 +0000 Received: from smtp93.iad3a.emailsrvr.com ([173.203.187.93]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miyEP-00BFEU-Dx for barebox@lists.infradead.org; Fri, 05 Nov 2021 12:22:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20190130-41we5z8j; t=1636114922; bh=1TnL+tNYqfMvVEu3PvChYq68HQNKmYSuMsbs7KBND+0=; h=From:To:Subject:Date:From; b=B9fj6rA/LGWGSsJxCLbQ+nJP3z13lKBv9Bm6sCWBt2/FrCuaWYKcedbnFoySEevwi rUaka8dcbVlQSUhdIc8y/CNWauG77cqLJX1YVxPrZkZmz/hRc8Z9Os/UUP99uRBRec CJXyI+4AYXSakkDqeRBevTZa4qgkN+MuEHlYjFvE= X-Auth-ID: abbotti@mev.co.uk Received: by smtp36.relay.iad3a.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id A37BF42B5; Fri, 5 Nov 2021 08:22:01 -0400 (EDT) From: Ian Abbott To: barebox@lists.infradead.org Cc: Steffen Trumtrar , Ian Abbott Date: Fri, 5 Nov 2021 12:21:46 +0000 Message-Id: <20211105122146.29370-3-abbotti@mev.co.uk> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211105122146.29370-1-abbotti@mev.co.uk> References: <20211105122146.29370-1-abbotti@mev.co.uk> MIME-Version: 1.0 X-Classification-ID: 6f09cc8c-29e8-4c57-a62d-ba4724a39c85-3-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211105_052205_590915_754306DE X-CRM114-Status: GOOD ( 14.82 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.5 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/2] ARM: Terasic SoCkit: Use upstream compatible string X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) The upstream (Linux) 'compatible' string for the Terasic SoCkit board in "dts/src/arm/socfpga_cyclone5_sockit.dts" differs from the barebox 'compatible' string for the same board in "arch/arm/dts/socfpga_cyclone5_sockit.dts": Linux: "terasic,socfpga-cyclone5-sockit" barebox: "terasic,sockit" That results in an incompatibility when trying to boot a bootloader spec entry with a 'devicetree' key that refers to the DTB file built from the Linux sources. The barebox bootloader spec loader will ignore the entry because the 'compatible' string in the root node of the DTB does not match what barebox expects. Remove the 'compatible' string list from "arch/arm/dts/socfpga_cyclone5_sockit.dts" so that barebox uses the upstream compatible string list. Also remove the 'model' string ("Terasic SoCkit") which is identical to the upstream 'model' string. Finally, update the `of_machine_is_compatible("terasic,sockit")` function call in `socfpga_console_init()` to use the "terasic,socfpga-cyclone5-sockit" string. Cc: Steffen Trumtrar Signed-off-by: Ian Abbott --- arch/arm/boards/terasic-sockit/board.c | 2 +- arch/arm/dts/socfpga_cyclone5_sockit.dts | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/boards/terasic-sockit/board.c b/arch/arm/boards/terasic-sockit/board.c index ec68315998..19e67ff933 100644 --- a/arch/arm/boards/terasic-sockit/board.c +++ b/arch/arm/boards/terasic-sockit/board.c @@ -25,7 +25,7 @@ static int phy_fixup(struct phy_device *dev) static int socfpga_console_init(void) { - if (!of_machine_is_compatible("terasic,sockit")) + if (!of_machine_is_compatible("terasic,socfpga-cyclone5-sockit")) return 0; if (IS_ENABLED(CONFIG_PHYLIB)) diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts index 23e07c964c..27d2087a33 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts @@ -19,9 +19,6 @@ #include "socfpga.dtsi" / { - model = "Terasic SoCkit"; - compatible = "terasic,sockit", "altr,socfpga"; - chosen { stdout-path = &uart0; -- 2.33.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox