From patchwork Fri Mar 22 11:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914830 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=nCbruU/Q; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=cRn2n4OX; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L7m4xH4z1yWp for ; Fri, 22 Mar 2024 22:43:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 45BF3881DA; Fri, 22 Mar 2024 12:43:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107816; bh=Mv3ImWb/673DzaeGruwLaQ9BcQoZ8rmRlT0cvRzkMVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=nCbruU/QRMJxjKJDGPUdxf8jpbmxkUXuIva89bUZaMNMeziuaNjrRCKkYChrd3dML zbQRsxWOCiTJSJd1+Ac87WPWz+iNjFXhU5lPFES6K49dVLWPB4Q8hpcfzJGX57ucJ0 yzxTQqu9wKaDTnVyXJJYTxH3Oa2+DByQewsuYUxgn8FtQ02sj+C1zQKXjzSsSXJu8S GjqWDMAJn1vFWkVVe7NUm/bHXte+UTOlZ/PGGiGhz63vqOi4D9QpVFKOxDjyMG0OoW POjs7Ix6tXlGPyIdQlk4QH2uSp7m89BUtcOHfTKrzf/726evGrL8lcDwCBZ6jdQCmc SViBJSnsiy6+w== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id C8B5087B82; Fri, 22 Mar 2024 12:43:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107814; bh=Mv3ImWb/673DzaeGruwLaQ9BcQoZ8rmRlT0cvRzkMVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRn2n4OXAEgweaqcq2A+JSLjg3taSp3jQBWfZTKtZK9I65BSGvXztdf2vWMgHNPrC 2WfNIEaw7eHCPMVqSgXzRjcVngXYoeUolDYJySRQqUXq3ZRNn+ZPbWTlSaoTT7Tyrh sYNezstb/t4wEFuIYihZF/o5ci/s3obcP9MEyPWEerLWM3ERt3J299mx0VIeZw/FHs zHmiv5LHHBggz3KkQria4u229iCzScJQinQR1ue3sCTxI0J5CdRvAGRYJW2131MXc2 5I1ipfN71NTPUTC4Goj6g0bzELPxB/s12w1gh7bA4TyL5kP8tXmQk4BRjEdRzuq+x8 8SaQvRy7KWU4A== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Tom Rini Subject: [PATCH 01/12] arm: spl: xea: Remove I2S pins configuration from early initialization Date: Fri, 22 Mar 2024 12:43:04 +0100 Message-Id: <20240322114315.2720727-2-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean XEA is not supporting and using I2S codec, so there is no need to configure pins for it. Signed-off-by: Lukasz Majewski --- board/liebherr/xea/spl_xea.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c index df354cac64..551ed6fbae 100644 --- a/board/liebherr/xea/spl_xea.c +++ b/board/liebherr/xea/spl_xea.c @@ -112,13 +112,6 @@ const iomux_cfg_t iomux_setup[] = { MX28_PAD_I2C0_SCL__I2C0_SCL, MX28_PAD_I2C0_SDA__I2C0_SDA, - /* I2S Codec */ - MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK, - MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK, - MX28_PAD_SAIF0_MCLK__SAIF0_MCLK, - MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0, - MX28_PAD_SAIF1_SDATA0__SAIF1_SDATA0, - /* PWR-Hold */ MX28_PAD_SPDIF__GPIO_3_27, From patchwork Fri Mar 22 11:43:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914831 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=e1dkSd7t; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=FMrz8tC2; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L7x2zDlz1yWp for ; Fri, 22 Mar 2024 22:43:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7FE2881EC; Fri, 22 Mar 2024 12:43:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107818; bh=W2SIImO38ouVpgkps1pm/Gfp7We6piaKHqANJcbDs0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=e1dkSd7tFh1jKsljQhQkUkYPO9BHn0HrHAQcBv4gdKKj6mcxZ7KdenkLiGJFYb6Ql gYgzHRzeXozBHJxr2a2ZkklBNq/2OTMOME0Q8DBCETPW9qdgFBZKRlREgRokWE0Hv+ X0s+fcA3/+yWnQ9fM5HTxnBqbPrGZ414aNuFYWkn+p99PGo+2jMvyI70/tgTYWtYOj W8aTcL+OfB3aCNBwpJSy4ez6C4mzFykDhE41OVxamHbxzOb0pcxuudaKJjtxrXtquD HfDeHP3yIDfkug9bpadLbNmZFNEXiR7gDMVo+jivL6ldIJ27qIXALB4xoQLVwOO23W 9p7HTE7gNb4Yw== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 2B06C881D4; Fri, 22 Mar 2024 12:43:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107815; bh=W2SIImO38ouVpgkps1pm/Gfp7We6piaKHqANJcbDs0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMrz8tC2Y9HcjsROSAZ802Qm4ZTuagt6yvECcz6ITUjhj6J+dtyhsoYb/O3RS3jOS Y0iP3pXcQl5wlBcQoBwlnPPVlUiTy+pbNbKXlgOLkYsyrKaSeE2I2+mgZVnlBdzxvG CfPzhYfGLyzjkEpO8dJ9lNcZnR0kQ/SZa/Xtyfe3+Z2rznl6jsTVDRJIxvFQU8T/sh SzTVehmLM11at2ltPMfKm+bkSDNAz4+gi50zFlHfFSxNqvd5qJ66CzJqxkdu/VuMte bH5yKzuG05+IOJwseeEvEQDSiDrfZhN5AwcZG2FoU7AJi0nHDQR//HyuA+BcrUKzLR yndnMrzLZY0yw== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Anatolij Gustschin , Tom Rini Subject: [PATCH 02/12] arm: xea: Add support for reading SoM (CPU) and base board HW revision Date: Fri, 22 Mar 2024 12:43:05 +0100 Message-Id: <20240322114315.2720727-3-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The XEA board now has several HW revisions for both SoM and base boards. This patch provides support for reading those revision ID values in SPL (u-boot.sb) and then pass this information to u-boot proper, as the maximal SPL size (~55KiB) is not allowing for having FIT support in it. It was necessary to handle reading GPIOs values solely in u-boot proper as one configuration (i.e. 'single binary' - imx28_xea_sb_defconfig) is not using SPL framework. Signed-off-by: Lukasz Majewski --- board/liebherr/xea/spl_xea.c | 11 +++++++++++ board/liebherr/xea/xea.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c index 551ed6fbae..71194db235 100644 --- a/board/liebherr/xea/spl_xea.c +++ b/board/liebherr/xea/spl_xea.c @@ -230,6 +230,17 @@ const iomux_cfg_t iomux_setup[] = { /* TIVA boot control */ MX28_PAD_GPMI_RDY3__GPIO_0_23 | MUX_CONFIG_BOOT, /* TIVA0 */ MX28_PAD_GPMI_WRN__GPIO_0_25 | MUX_CONFIG_BOOT, /* TIVA1 */ + + /* HW revision ID Base Board */ + MX28_PAD_LCD_D12__GPIO_1_12, + MX28_PAD_LCD_D13__GPIO_1_13, + MX28_PAD_LCD_D14__GPIO_1_14, + + /* HW revision ID (SoM) */ + MX28_PAD_LCD_D15__GPIO_1_15, + MX28_PAD_LCD_D16__GPIO_1_16, + MX28_PAD_LCD_D17__GPIO_1_17, + MX28_PAD_LCD_D18__GPIO_1_18, }; u32 mxs_dram_vals[] = { diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c index c8ac526cb4..d9cf27c81b 100644 --- a/board/liebherr/xea/xea.c +++ b/board/liebherr/xea/xea.c @@ -48,6 +48,35 @@ DECLARE_GLOBAL_DATA_PTR; * Functions */ +/* + * Reading the HW ID number for XEA SoM module + * + * GPIOs from Port 1 (GPIO1_15, GPIO1_16, GPIO1_17 and GPIO1_18) + * are used to store HW revision information. + * Reading of GPIOs values is performed before the Device Model is + * bring up as the proper DTB needs to be chosen first. + * + * Moreover, this approach is required as "single binary" configuration + * of U-Boot (imx28_xea_sb_defconfig) is NOT using SPL framework, so + * only minimal subset of functionality is provided when ID is read. + * + * Hence, the direct registers' access. + */ +#define XEA_SOM_HW_ID_GPIO_PORT (MXS_PINCTRL_BASE + (0x0900 + ((1) * 0x10))) +#define XEA_SOM_REV_MASK GENMASK(18, 15) +#define XEA_SOM_REV_SHIFT 15 + +static inline u8 get_som_rev(void) +{ + struct mxs_register_32 *reg = + (struct mxs_register_32 *)XEA_SOM_HW_ID_GPIO_PORT; + + u32 tmp = ~readl(®->reg); + u8 id = (tmp & XEA_SOM_REV_MASK) >> XEA_SOM_REV_SHIFT; + + return id; +} + static void init_clocks(void) { /* IO0 clock at 480MHz */ From patchwork Fri Mar 22 11:43:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914833 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=D56om+jO; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=q57/nAVi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L8L5Xy5z1yWp for ; Fri, 22 Mar 2024 22:44:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C9067881FD; Fri, 22 Mar 2024 12:43:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107819; bh=1B7EQYD4zyZltpQ9mmsk0oVM3EPjKWhl4KhScNTBzAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=D56om+jOLmwfnxaqv0AxCejFfTHLn7QdrxhLfSsICMtChzNhaaZmBqR2bMDoRSsLS f2SW/AiVJKfpZvRDi7TQr9DnbH+W0uJAJXEv65rylgtX/sSt+rwBuuHgxv/DcBFxOo Z/gBtm0shwR4S/V8zwBuGhgj5V+x1MCz2XEasNnVgPDaFZkqfDRMAJXuyiBx/6QAnS Zk8trG6M2A0yYpw7EedsWQ2scg2eadVLpcN/UtmnjykaGNH1BbD/nKUk4fmjXiFlcF TG80Q6wW74TxMeuZLHGfRlIkq1g0gLOudrwzwsPYZggM0I6TAB2nnXV2o4m53r/f3+ xJN/oj7GfeuVQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 89820881DF; Fri, 22 Mar 2024 12:43:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107816; bh=1B7EQYD4zyZltpQ9mmsk0oVM3EPjKWhl4KhScNTBzAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q57/nAViGw8AuUCdVN3haRI285WFVeMU6ZWMLmIR0ylbsO5gRVCwjSN4Suv+AcmT4 NYfmzZ2XBrIHqf9GiGxoySkGDRlkb9J2zqyJ2PGlW/Im1yssSj/o6WzcXy1Tg5++6t yvIyfU3yCG8x+fkzgZkN0ThYYz1e1BEdBmv8uo0mQPkV9clt7QPZFhZplREyn5h1Xk yJObxAG8mTyfdFqLkt8nxBmP7iijbPQhIqh/q3ZuS9gTlNUrwmnsZhZ4IYvaVgADdm peOfOKyP+RWNRu/1HcStTQrC7ar5T4us7qTshgxsGEqy07iXqhbwqAF8Nkak+ALQMm czc9h+WrTJtSw== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Christian Hewitt , FUKAUMI Naoki , Fabio Estevam , Hai Pham , Jonas Karlman , Kever Yang , Marek Vasut , Mathieu Othacehe , Michal Simek , "NXP i.MX U-Boot Team" , Neil Armstrong , Simon Glass , Svyatoslav Ryhel , Tianling Shen , Tom Rini Subject: [PATCH 03/12] arm: xea: Rename imx28-xea.dts to imx28-xea-1.dts Date: Fri, 22 Mar 2024 12:43:06 +0100 Message-Id: <20240322114315.2720727-4-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The former imx28-xea.dts file has been renamed to imx28-xea.dtsi, which is included to new imx28-xea-1.dts file. This is a preparatory work to add support for multiple versions of XEA boards to u-boot. Signed-off-by: Lukasz Majewski --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/imx28-xea-1-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx28-xea-1.dts | 8 ++++++++ arch/arm/dts/{imx28-xea.dts => imx28-xea.dtsi} | 0 board/liebherr/xea/xea.env | 2 +- configs/imx28_xea_defconfig | 2 +- configs/imx28_xea_sb_defconfig | 2 +- 7 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/imx28-xea-1-u-boot.dtsi create mode 100644 arch/arm/dts/imx28-xea-1.dts rename arch/arm/dts/{imx28-xea.dts => imx28-xea.dtsi} (100%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index b102ffb5f6..4fc508bcfc 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -879,7 +879,7 @@ dtb-$(CONFIG_TARGET_MX23_OLINUXINO) += \ dtb-$(CONFIG_MX28) += \ imx28-evk.dtb \ - imx28-xea.dtb + imx28-xea-1.dtb dtb-$(CONFIG_MX51) += \ imx51-babbage.dtb diff --git a/arch/arm/dts/imx28-xea-1-u-boot.dtsi b/arch/arm/dts/imx28-xea-1-u-boot.dtsi new file mode 100644 index 0000000000..4b2b21eeae --- /dev/null +++ b/arch/arm/dts/imx28-xea-1-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + */ + +/* + * The minimal augmentation DTS U-Boot file to allow eMMC driver + * configuration in SPL for falcon boot. + */ +#include "imx28-xea-u-boot.dtsi" diff --git a/arch/arm/dts/imx28-xea-1.dts b/arch/arm/dts/imx28-xea-1.dts new file mode 100644 index 0000000000..8cb1190ba5 --- /dev/null +++ b/arch/arm/dts/imx28-xea-1.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + */ + +/dts-v1/; +#include "imx28-xea.dtsi" diff --git a/arch/arm/dts/imx28-xea.dts b/arch/arm/dts/imx28-xea.dtsi similarity index 100% rename from arch/arm/dts/imx28-xea.dts rename to arch/arm/dts/imx28-xea.dtsi diff --git a/board/liebherr/xea/xea.env b/board/liebherr/xea/xea.env index 043099ae87..ac6ac898ec 100644 --- a/board/liebherr/xea/xea.env +++ b/board/liebherr/xea/xea.env @@ -3,7 +3,7 @@ bootpri=mmc_mmc bootsec=sf_swu consdev=ttyAMA0 baudrate=115200 -dtbfile=imx28-xea.dtb +dtbfile=imx28-xea-1.dtb rootdev=/dev/mmcblk0p2 netdev=eth0 swufile=swupdate-image-xea-upd.itb diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig index 64a0561a34..42cbc3d34c 100644 --- a/configs/imx28_xea_defconfig +++ b/configs/imx28_xea_defconfig @@ -11,7 +11,7 @@ CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_IMX_CONFIG="" CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="imx28-xea" +CONFIG_DEFAULT_DEVICE_TREE="imx28-xea-1" CONFIG_SPL_TEXT_BASE=0x1000 CONFIG_TARGET_XEA=y CONFIG_SPL_MXS_PMU_MINIMAL_VDD5V_CURRENT=y diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig index 9872d35c1b..30b3568e7f 100644 --- a/configs/imx28_xea_sb_defconfig +++ b/configs/imx28_xea_sb_defconfig @@ -9,7 +9,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="imx28-xea" +CONFIG_DEFAULT_DEVICE_TREE="imx28-xea-1" CONFIG_SPL_TEXT_BASE=0x1000 CONFIG_TARGET_XEA=y CONFIG_SPL=y From patchwork Fri Mar 22 11:43:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914834 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=MKdJk1xX; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=lSvrX9Sf; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L8W4pW0z1yWp for ; Fri, 22 Mar 2024 22:44:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EEF488210; Fri, 22 Mar 2024 12:43:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107820; bh=pTguwxuGntk/JSW+XreRnzCcwPZjDumRfSo2+3nnEYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MKdJk1xXCKqQxHTZvzezLtfZdNBARL9OhwWGSswaAlzHLC6XT0sirTN2VgNYPC1KG /rMVSTgIknWIPAQEQwQmM22eiLm58fMzI69BbWnOq0+TvX2/rPmmFQPB6YDelErdJN qGVr8JnyIs3pBI5xkpiytIozp8vPYIlSlUbTxQYYov9mTxrTB0X9PsIX4ED8Cko9+B ftEGevUAQYMmYgVTlBh1xqWoUCvjiQxn/LeLLsB35YrSDEFsCYnHVw9RSfWOOG5N9S GEHVJr16hI6FrYrHI2dqEaB5ObL19lzQ2wg7DCRJm2j/FS1BVKpA3K33msf097//w6 DBGdUVh138XXw== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 4F989881E6; Fri, 22 Mar 2024 12:43:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107816; bh=pTguwxuGntk/JSW+XreRnzCcwPZjDumRfSo2+3nnEYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lSvrX9Sf93T6Wi9TTYOiJUCL1k5muxHzdijJOUfS7FfhHxwt87T1mVy2g5xbM9k+U jkel358cdmBkuVvyl7EXGXyvA0F+RRDoZnJ0Z68RMc2y2Dl2IAEDwqAtEwR2fZU1Cv x4G5NNpwt+7AT/dfAOL8DupXBhrCtU0X66Xmiu6zh3FkTHciCRi+viYBFLf49C7zDZ 6QR1oaBd+u5pKGjF+8/5HKUlPbiXIaS3WpnycPCDNNU91lS8FWE28ckFp0Frngb9Ek hlwMh8io+zEwwfHvDtwjYjjAPKqg7sm4Yavfq/IJ0QAOVsx5cNTZQHlqEgHCPv8AT6 Lp7pmlzmrwyfA== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Fabio Estevam , "NXP i.MX U-Boot Team" , Tom Rini Subject: [PATCH 04/12] dts: xea: Move phy-reset-gpios property to version specific DTS file Date: Fri, 22 Mar 2024 12:43:07 +0100 Message-Id: <20240322114315.2720727-5-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The DTS description in XEA for mac0 node in u-boot differs considerably from what we do have available in Linux, as u-boot is not supporting L2 switch (i.e. 'fixed-link' property is used). To facilitate HW revision management - this particular property has been moved to version specific file. Signed-off-by: Lukasz Majewski --- arch/arm/dts/imx28-xea-1-u-boot.dtsi | 4 ++++ arch/arm/dts/imx28-xea-u-boot.dtsi | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx28-xea-1-u-boot.dtsi b/arch/arm/dts/imx28-xea-1-u-boot.dtsi index 4b2b21eeae..2903be2089 100644 --- a/arch/arm/dts/imx28-xea-1-u-boot.dtsi +++ b/arch/arm/dts/imx28-xea-1-u-boot.dtsi @@ -9,3 +9,7 @@ * configuration in SPL for falcon boot. */ #include "imx28-xea-u-boot.dtsi" + +&mac0 { + phy-reset-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/dts/imx28-xea-u-boot.dtsi b/arch/arm/dts/imx28-xea-u-boot.dtsi index bdbeca528c..13a581f7a6 100644 --- a/arch/arm/dts/imx28-xea-u-boot.dtsi +++ b/arch/arm/dts/imx28-xea-u-boot.dtsi @@ -50,7 +50,6 @@ pinctrl-names = "default"; pinctrl-0 = <&mac0_pins_a>; phy-supply = <®_fec_3v3>; - phy-reset-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>; phy-reset-duration = <1>; phy-reset-post-delay = <1>; status = "okay"; From patchwork Fri Mar 22 11:43:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914835 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=LZX9Kutq; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=B+Nt2spG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L8k2Bn3z1yWp for ; Fri, 22 Mar 2024 22:44:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A320F8821D; Fri, 22 Mar 2024 12:43:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107820; bh=Ap7wF8V9fIlvJoLnngdGeMb4HnAYX13TVmv+N3zOWZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=LZX9KutqoFQ4D5HmgmZg7lhIIpSWVg38m9BVRo7fy/34/Uq8MAEM1ViYt3Gn7U6hZ UCrJCaF7G1ZfQC+7fwA2ihH3ZFl99PN3S1ld0w444ItDioVeGqvQyI6mHeOfV9lJY7 Q8u2/eUI+blSoNMDNV+FB1yCpswswzA+ImCWe4N63NT4vOTJdcQd/qv5KSi2IuxSq0 4fTjtaIm83iAdFomOI2JbMDXdvD4jHoOe4Kl6hRqn9CaOT6jQO/wEwbTPKEUTDzMk1 svEgSCkqNTCDR03R3VYhGey0Viv5mpevW4Q5Yaw0fhY4g7cxlgZ9PL5tC134Y/hJbY faIqAYKMotWKg== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id AECB5881EA; Fri, 22 Mar 2024 12:43:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107816; bh=Ap7wF8V9fIlvJoLnngdGeMb4HnAYX13TVmv+N3zOWZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B+Nt2spGFCVQIeFDKsDzA+8rW/wC6C0bvstRMeosb82YX2h4HrVKRyQeUt0VlgXtD sQ3KhoZrqR4lDi/J/RI6S+8lq5XeqTYW4pIXwtDIBXuDqeaM60sLL04bxn3nvHygUK fWSdmPr7Te8PpI7GlMvvL8Y5KNliyib0H0uet7QIBuAWsX2k6RDArJx7qrVk9U7LFD HlG254Ff3ssKFZMJu86KHnF+TFUGitxRu8ZewK+CwieBDmOlKEIY2IRYaDOseSsRHt wpKo53kaunr1mo9nPDTrbZftjdFbfQREqOWrRCgqW/b557LmW33+vtvqObfqQE48Gk 0NLlXElQNlk6w== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Fabio Estevam , "NXP i.MX U-Boot Team" , Tom Rini Subject: [PATCH 05/12] dts: xea: Remove outdated comment Date: Fri, 22 Mar 2024 12:43:08 +0100 Message-Id: <20240322114315.2720727-6-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The comment in u-boot specific adjustment to XEA DTS is not valid anymore. Signed-off-by: Lukasz Majewski --- arch/arm/dts/imx28-xea-1-u-boot.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/dts/imx28-xea-1-u-boot.dtsi b/arch/arm/dts/imx28-xea-1-u-boot.dtsi index 2903be2089..6cb6c66924 100644 --- a/arch/arm/dts/imx28-xea-1-u-boot.dtsi +++ b/arch/arm/dts/imx28-xea-1-u-boot.dtsi @@ -4,10 +4,6 @@ * Lukasz Majewski, DENX Software Engineering, lukma@denx.de */ -/* - * The minimal augmentation DTS U-Boot file to allow eMMC driver - * configuration in SPL for falcon boot. - */ #include "imx28-xea-u-boot.dtsi" &mac0 { From patchwork Fri Mar 22 11:43:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914836 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=uDUtqJhr; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=Vundh7uM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L8y6R5fz1yWp for ; Fri, 22 Mar 2024 22:44:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 159D388225; Fri, 22 Mar 2024 12:43:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107821; bh=0k637n1HW6P0eUCRsAatIwfvlhwPqOkxCBMluFt69uw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=uDUtqJhrtY6EZ1aZ8PlRIVBbaJXgRvlFugEIWiLO4CnHCZiLoapgpl8evZwdb2QFr 1IO3SBuJ7c7qii4XmlzI8AMQCAzYhGKAL2ZGHrgbdWwi7sDDVmSHRBt5uTebcfbzgS 4CRDBp3U2VH2b+XqZABPv+wsTSfYaDyVERzoHUmdHxNTZtyj01SN/v0lCSb7txnUyG 9+a8SUFlHbr2snoL56u/FMpOY8Zxbebf3z1cSCZGnfGoDD1uQkkDjww5v8yLCd0DBu 5H1MdbbriLQ3d5fRtoD4xLlxUQ7S0YzDBw1ou3O4LvcPlzIlcE1PUq3qnRrjIERHP8 kCT6oL8Zc7pLQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 1FC51881EB; Fri, 22 Mar 2024 12:43:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107818; bh=0k637n1HW6P0eUCRsAatIwfvlhwPqOkxCBMluFt69uw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vundh7uMurEbv1EEI/0t1qinq0V2UEJ1RWR5h6ixONml8BPIbu+AlucYbp+0yhkCd imihYmEkh1hqym4/BkNAKBiqUDhgSCVVh18z/vXrRipWoUj7j/TCYiKnavahf3hpeJ umahPbn2/O7QUc14YEvFLicEsJk+ZAnfzoyqxKSLx5E68bm/4WvrEPdijgDX/BqpB5 uwwtaDdKNWVrbpirCRY5Rh6Cc/yCjUZ39RqswXpI0cIkCJ+BrYWqOH7OaQRqsJ3Q8f +dmACxIuL9tqv1H17gs3gLyz/2jLJu1wbcTotV3q5Ctb3tC6huh4YOVWuo1Dx3JY8s eIH6qd8ta94wQ== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Anatolij Gustschin , Tom Rini Subject: [PATCH 06/12] arm: xea: Add support for multiple dtbs in u-boot Date: Fri, 22 Mar 2024 12:43:09 +0100 Message-Id: <20240322114315.2720727-7-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean As XEA board uses imx287, which has some constrains on SPL (u-boot.sb) size - it must be less than ~55 KiB, multiple boards versions are included in u-boot proper's FIT image. The decision of using proper configuration is based on information passed from SPL (u-boot.sb) in OCRAM dedicated location (0xE000 - 2). This board also uses falcon boot for production setup, so the proper dtb is flashed during production (also based on GPIO values describing HW ID). Signed-off-by: Lukasz Majewski --- board/liebherr/xea/xea.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c index d9cf27c81b..615d266b8f 100644 --- a/board/liebherr/xea/xea.c +++ b/board/liebherr/xea/xea.c @@ -287,6 +287,21 @@ int dram_init(void) return mxs_dram_init(); } +#if defined(CONFIG_MULTI_DTB_FIT) +int board_fit_config_name_match(const char *name) +{ + u8 rev_id = get_som_rev(); + char board[11]; + + sprintf(board, "imx28-xea-%d", rev_id); + + if (!strncmp(name, board, sizeof(board))) + return 0; + + return -EINVAL; +} +#endif + #ifdef CONFIG_OF_BOARD_SETUP static int fdt_fixup_l2switch(void *blob) { From patchwork Fri Mar 22 11:43:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914837 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=GBuLHRst; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=fXNcgeV2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L9D0ycyz1yWy for ; Fri, 22 Mar 2024 22:45:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F21F881DF; Fri, 22 Mar 2024 12:43:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107824; bh=ptbjB7vny7LMXOI5RNKTmwDDnUc7llEs9SFC1px7cdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=GBuLHRstP1PzLk4uBSrUuc61A6a15VyKy6egx4qOWrG6h+A+VMKDpVN/erJV5QvDL 7bJ9SUxF6bDF7MrAYWyS/FYrNpNi2lZ1eSWfdHoKT93M3QKgzxrUIIeUAP4urajiY4 1ZIcfbXIiJkKTrHHc9BHINFHr1V1Gti9Z/7HCMw6zu0y4NN/7nfT9dkN8wgYkbHk3w hhPEAnt84YHzVmJCrhLQI7ckIOLw+6MGWLVjwcRPy8dC698rNW5pDgEuSCkWk7Z6Ld 78YNco4nQjQGTGMGpFzT0NrWzD7dJVI63X6Q22AaWDWvOyr+eREVfeCKFDgo+LYm9f WTGK04n/E00ng== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 9944C881E6; Fri, 22 Mar 2024 12:43:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107819; bh=ptbjB7vny7LMXOI5RNKTmwDDnUc7llEs9SFC1px7cdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fXNcgeV2BIIWzPR4E0bqYIse2p4QqL3liUEwMTNsqfwWiinOZ8EHd143Qr/tWSA9f gmj9p6hd7foRk9GSSiGYU8LjEXs6df29qWWqzTw6NWK8yg44BIKjrYNBLrgdpJMRpB w2DLrTab4x5EEzUoUwrH6z8L0tuL8OTchp50Txm87hLn5Xzu/36t2GzuvrBQ5pyg+P TJCX0g/FT09chX376Ib9rAMew5h/NcMv+Zm2asxDGHKc63wSRLYeEBGR03IPptu9LO Y6EJo6HcfGPrv6jSE2Qnch7BpnppDxVUi6//UWebgdF4yUUUgKVic4Az78STspmsvY IRgURDlMAc/Hg== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , FUKAUMI Naoki , Fabio Estevam , Hai Pham , Jonas Karlman , Kever Yang , Marek Vasut , Mathieu Othacehe , Michal Simek , "NXP i.MX U-Boot Team" , Neil Armstrong , Svyatoslav Ryhel , Tianling Shen , Tom Rini Subject: [PATCH 07/12] dts: xea: Add device tree description for XEA HW rev. 2 Date: Fri, 22 Mar 2024 12:43:10 +0100 Message-Id: <20240322114315.2720727-8-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean For SPL and u-boot proper, the difference between revsions boils down only to the GPIO pin for PHY reset. Signed-off-by: Lukasz Majewski --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/imx28-xea-2-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx28-xea-2.dts | 8 ++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx28-xea-2-u-boot.dtsi create mode 100644 arch/arm/dts/imx28-xea-2.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 4fc508bcfc..69131599ae 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -879,7 +879,8 @@ dtb-$(CONFIG_TARGET_MX23_OLINUXINO) += \ dtb-$(CONFIG_MX28) += \ imx28-evk.dtb \ - imx28-xea-1.dtb + imx28-xea-1.dtb \ + imx28-xea-2.dtb dtb-$(CONFIG_MX51) += \ imx51-babbage.dtb diff --git a/arch/arm/dts/imx28-xea-2-u-boot.dtsi b/arch/arm/dts/imx28-xea-2-u-boot.dtsi new file mode 100644 index 0000000000..6ce82531d5 --- /dev/null +++ b/arch/arm/dts/imx28-xea-2-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + */ + +#include "imx28-xea-u-boot.dtsi" + +&mac0 { + phy-reset-gpios = <&gpio3 21 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/dts/imx28-xea-2.dts b/arch/arm/dts/imx28-xea-2.dts new file mode 100644 index 0000000000..8cb1190ba5 --- /dev/null +++ b/arch/arm/dts/imx28-xea-2.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2024 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + */ + +/dts-v1/; +#include "imx28-xea.dtsi" From patchwork Fri Mar 22 11:43:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914838 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=Bt7ReCUf; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=pFAtfdnc; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L9Q6FYyz1yXy for ; Fri, 22 Mar 2024 22:45:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DDD2A88217; Fri, 22 Mar 2024 12:43:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107824; bh=eJOr65NrCaA1tj3dKnYB22gVwpRA0ancxXdUR7BpvcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Bt7ReCUffgghtbMQLr58+FCM4/XLaKANg2vKOIiRYN7GaTqsae/ruCoG1ocX9AFSb 001cJsVRupDZdtTVgVRny0vvd16mjKBdzNvoOwRu04OR7nUThsg+RlFEJG+zACfVpE Uz3bpKsB5fgBBZfCD3YmA73M1ETcpYm6dQn1ir8wZSLMztx9bfEKdHwVP/LLnBTb4J cB7xUy4/HgaYtiJoMPWyi0SPadGfrBUfBTaRjFLe6nqgNkDnWuaaaqHNzfHdqcvk80 llqPFHM5KQqa84A9jQqBxA52LQFJYwFBTVGAQGPw2piAGdzjrc+3cHSuqxFWS8AXn/ A/Ei6EhTk0pTg== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 42E7C881FA; Fri, 22 Mar 2024 12:43:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107819; bh=eJOr65NrCaA1tj3dKnYB22gVwpRA0ancxXdUR7BpvcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pFAtfdncdg1+7nEv/uUz9we+WORC4FG2Vx5X/loJRO3Py7UJlR/RCK1NWh/Chko6O bGJAiikAA++5mQ9voA9t32vkwDjgBigv59Ht55IlBEy/HhrP7Mv7PC9ozPrt4Y6DQM OiAFmgIrX9Si0vaxllMJvGU7N0+VKt465haqswThDHDLTRk7BhP9i9lJWgmXoNE2oz eRu860QAdP4NuYXiHzxlWaU2AWadYVxMpcfex4s/TBjjeWF6NsWdDH8gOnbjjb7xry cAj5ZjF4mwgVqGlKYVOm0QdssAoexr7+9CmAyHg9yz/qyG6jxLM1k+RuzWGguViYRm wZ56qCpbFNUfw== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Tom Rini Subject: [PATCH 08/12] arm: spl: Add definition for PHY reset GPIO for XEA HW rev. 2 Date: Fri, 22 Mar 2024 12:43:11 +0100 Message-Id: <20240322114315.2720727-9-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The imx287 based XEA board's revision 2 uses GPIO_3_21 for PHY reset It is safe to keep the GPIO_2_13 as well, as in the SPL SPI1 is not used for transmission. This simplifies the code, as the proper configuration is performed either in falcon boot's read DTB or in u-boot proper (with correct FIT configuration chosen). Signed-off-by: Lukasz Majewski --- board/liebherr/xea/spl_xea.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c index 71194db235..6cf8f8390e 100644 --- a/board/liebherr/xea/spl_xea.c +++ b/board/liebherr/xea/spl_xea.c @@ -225,7 +225,8 @@ const iomux_cfg_t iomux_setup[] = { MX28_PAD_ENET0_TXD0__ENET0_TXD0 | MUX_CONFIG_ENET, MX28_PAD_ENET0_TXD1__ENET0_TXD1 | MUX_CONFIG_ENET, MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET, - MX28_PAD_SSP1_CMD__GPIO_2_13, /* PHY reset */ + MX28_PAD_SSP1_CMD__GPIO_2_13, /* PHY reset HW Rev. 1*/ + MX28_PAD_SAIF0_LRCLK__GPIO_3_21, /* PHY reset HW Rev. 2*/ /* TIVA boot control */ MX28_PAD_GPMI_RDY3__GPIO_0_23 | MUX_CONFIG_BOOT, /* TIVA0 */ From patchwork Fri Mar 22 11:43:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914839 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=wymLJCYG; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=TSw68w0e; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L9d5G7lz1yXy for ; Fri, 22 Mar 2024 22:45:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FE858821A; Fri, 22 Mar 2024 12:43:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107825; bh=J7LtdAyNIQOitk4rWpTatB2SbzFCx+4Ew3iCr1OAOT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=wymLJCYGsfe2hpULK2tF6/IX3TMfN+SM8lbYderoUjxc9KzzXLc1mcNEFrAwS2Fze +evW2dMhEJyf/zq8vr3hzx5GVCL6k1v/SRrJktSQFYmKHrR6pjO68AryLk3eIaJdnZ gijC57jCViIity1nVMVnqILqgOa8kDEwgIc9Grysf9ai6Q+Galj9MQIlp/9cSyRdAk pWGqsvOWUAsaU84TGWJ+mzV19D5HDAd3Of64KP0E0uzqFswlb03yKkw3zMJx1C+FEX vwkyjxg79+NjDkFzXT05tLxl1d6C7EWgwPDejplcukRq/rlchvSNMWKX1YWDcchH8i nq3Bwhs3LyTsw== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 918A487B82; Fri, 22 Mar 2024 12:43:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107819; bh=J7LtdAyNIQOitk4rWpTatB2SbzFCx+4Ew3iCr1OAOT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TSw68w0esp2I2ZWQ4oQb5msevZcwysKYg3vrJXLzym1tj7sQdFxkZGWXdg8tAMuJs Uo/CvcaXQYpdkcpnbJRJo/yo10kuFBmifwegZwU1ZjJqp08iDB9cf3EkODR4uMg71m 9DBkkSFjlr5/9sxLe5NlDHETCpCGYZvStQA9PMaO+uibr/ibweE4pqBHSiI8jYP3eQ xLx5oJNRmVXs1u8kqaOVh2W6QJnnwPhp93qpLxkPh6r8R5cV9bsoafUv674jNoR2RT zDkGA/rEkVmR2mLgglIKt5dVFPZFURUeeT+3AaooOPqh0X1sIww2VlrFZFM+Ao2qol xY79zrKGJ1OvA== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Tom Rini Subject: [PATCH 09/12] arm: config: xea: Enable support for multiple DTBs for XEA board Date: Fri, 22 Mar 2024 12:43:12 +0100 Message-Id: <20240322114315.2720727-10-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean After this change u-boot proper is able to support two HW revisions of the XEA board. Signed-off-by: Lukasz Majewski --- configs/imx28_xea_defconfig | 2 ++ configs/imx28_xea_sb_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig index 42cbc3d34c..bc8c167b1f 100644 --- a/configs/imx28_xea_defconfig +++ b/configs/imx28_xea_defconfig @@ -81,6 +81,8 @@ CONFIG_CMD_MTDPARTS=y CONFIG_DOS_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIST="imx28-xea-1 imx28-xea-2" +CONFIG_MULTI_DTB_FIT=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent interrupts" CONFIG_SPL_OF_PLATDATA=y # CONFIG_SPL_OF_PLATDATA_PARENT is not set diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig index 30b3568e7f..691edc2834 100644 --- a/configs/imx28_xea_sb_defconfig +++ b/configs/imx28_xea_sb_defconfig @@ -55,6 +55,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIST="imx28-xea-1 imx28-xea-2" +CONFIG_MULTI_DTB_FIT=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent interrupts" CONFIG_SPL_OF_PLATDATA=y # CONFIG_SPL_OF_PLATDATA_PARENT is not set From patchwork Fri Mar 22 11:43:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914840 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=jK6UvicL; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=e6Qknr+M; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1L9r5vX9z1yXy for ; Fri, 22 Mar 2024 22:45:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C9EB788227; Fri, 22 Mar 2024 12:43:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107825; bh=JFElZ01OsuLEt0y/J3RRtgoWvwPGc+7POH0YTTgQ6F0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=jK6UvicLmuGOyFirN/EjfqAbu1mZtD4iq1B14Fh6x+VAqhR9LmbzL5ro5pFVf0ZDF qDDv5hp4tTKt9UUtZC1ygD0lt79WQ02gbioaRv3vJTkbwLVGFilDAYe9hza9oKuHn7 9+D5Sk2L/V9YyzAmY+LlrRD1/IeXe+faCOCtImyx4qpf+XaolYpZMYqnTUGCaDIR7f BAFfU2jHA35u6UVye98amNrh2v+Wy8bB/JVU9MLLyi7gt7m/IuSE7KCenbOEGc5P8G xh+hmeFyUH4qhiEYCbYIHmvl7KUvHX35ZHjcQyddXfNaAXglhsUjUaTjQc9E8WAjZm KA4QDNIv6NJnQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id EE4848820D; Fri, 22 Mar 2024 12:43:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107820; bh=JFElZ01OsuLEt0y/J3RRtgoWvwPGc+7POH0YTTgQ6F0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e6Qknr+M1oqs22dDdSRsvP+9/uxDqrlI7F5ZL5EMkphcHLqMecxJB3QzW77Y67AYO ciGFdSzRo3F0Q/StfjZlUPeneArvFB79gtXizqi2nUqMIKDNwKwkGY0ginbuyj4U2e b3+uq1PBLLWRS9Uaxxc0welUHQur1H3kExa9CHzX4P2obGSt18okQpr9cV5SKF2sg4 kDyP+gd1mi3so2WIUwI98JTVpgvkL87jzRKUy1nkx715jvvuVOlg3ZW4BSxTd/DQ79 IEmx0vxWOefrUOZDswgDN0e/Uhir7XQwk2/0vKmJK6y065x1p5acI+a/v6t2EacgHl hOZYsiXoWYa2g== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Anatolij Gustschin , Simon Glass , Tom Rini Subject: [PATCH 10/12] config: xea: Enable late board initialization to set revision variable Date: Fri, 22 Mar 2024 12:43:13 +0100 Message-Id: <20240322114315.2720727-11-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The 'board_som_rev' environment variable will be used to point correct configuration from the Linux FIT file. Signed-off-by: Lukasz Majewski --- board/liebherr/xea/xea.c | 12 ++++++++++++ configs/imx28_xea_defconfig | 1 + configs/imx28_xea_sb_defconfig | 1 + 3 files changed, 14 insertions(+) diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c index 615d266b8f..5bac614153 100644 --- a/board/liebherr/xea/xea.c +++ b/board/liebherr/xea/xea.c @@ -282,6 +282,18 @@ int board_init(void) return 0; } +#if defined(CONFIG_BOARD_LATE_INIT) +int board_late_init(void) +{ + int ret = env_set_ulong("board_som_rev", get_som_rev()); + + if (ret) + printf("Cannot set XEA's SoM revision env variable!\n"); + + return 0; +} +#endif + int dram_init(void) { return mxs_dram_init(); diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig index bc8c167b1f..c416635b24 100644 --- a/configs/imx28_xea_defconfig +++ b/configs/imx28_xea_defconfig @@ -39,6 +39,7 @@ CONFIG_BOOTCOMMAND="run ${bootpri} ; run ${bootsec}" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run prebootcmd" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_NO_BSS_LIMIT=y CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig index 691edc2834..78e59b4cb2 100644 --- a/configs/imx28_xea_sb_defconfig +++ b/configs/imx28_xea_sb_defconfig @@ -23,6 +23,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200n8" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run prebootcmd" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_BOARD_LATE_INIT=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_NO_BSS_LIMIT=y CONFIG_SPL_BOARD_INIT=y From patchwork Fri Mar 22 11:43:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914841 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=u1CIn0Ji; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=qUaLQGO9; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1LB313ghz1yXy for ; Fri, 22 Mar 2024 22:45:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3197F8822B; Fri, 22 Mar 2024 12:43:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107826; bh=NZMPikK8NYq7cqUdf33MT83BrOv1OYUm8y6+gMxKV/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=u1CIn0JipeqN6iiCAmYmxtX6WVuWY/BB3mVHJYvyiu89cB3Jmkb8MyKyxpbwlQPTO N19XvLMQNieoZwYByNR8pxRbFyHZM8MDgnPfzL/0N5ERhS2noJclM8/LkbVoQahalY WSQ/VRwYO56MUqXALKJrTECKCQLFYrtSZYm5JiNWtyhr4wrwlHp2e2/1F8QV2UAIeY CGKnt+YqzZhBooA79cZxjHsmEKy4wduqHGGWTdhTOBPaf7ZG94o43K7eeACEW55+i0 4Q5jcrTQhsGospUhAJFNBfqhN2aiQEhqJuUh1hP6F8uGnLrgpdnH1qQlOxDbN/iZxC J1yOh4hD4+jaw== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 5DA7488215; Fri, 22 Mar 2024 12:43:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107820; bh=NZMPikK8NYq7cqUdf33MT83BrOv1OYUm8y6+gMxKV/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qUaLQGO98BAPVopM7/H2URkAhqSj9XzW6zVvORyybuxXy69WNAwQB3xEjpIojWomb 9v5uZZP/NZ2I4aVfC+q6XtpgZszmsDoeczArSXgtSnl1iT0TlIQN906rrWE23q+ano 0osHNJkQoLD8w/ydK8jhSF5U5vAbBFlCPhBmgPLNkWqDrJ2YrF7+C6/km4m17pQ+ss 22APLGeJwSwCF+prCF5RJ0i0vaR42kcGWA5Qef2UzGIuBgHiutagz257oYtp6L6d0X d3PWZ7eI8KSQyZGa3GDb/zTY8oRlx8c7eMPlxIyLSrMF9+p1OLwa2exhUB3vmjfo6j tzgG+FkQzuHFw== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Anatolij Gustschin , Tom Rini Subject: [PATCH 11/12] arm: xea: Print information about XEA's SoM HW revision Date: Fri, 22 Mar 2024 12:43:14 +0100 Message-Id: <20240322114315.2720727-12-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean As now XEA has its second HW revision - this information is printed when u-boot proper starts. Signed-off-by: Lukasz Majewski --- board/liebherr/xea/xea.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c index 5bac614153..876e8a70ab 100644 --- a/board/liebherr/xea/xea.c +++ b/board/liebherr/xea/xea.c @@ -294,6 +294,15 @@ int board_late_init(void) } #endif +#if defined(CONFIG_DISPLAY_BOARDINFO) +int checkboard(void) +{ + printf("Board: LWE XEA SoM HW rev %d\n", get_som_rev()); + + return 0; +} +#endif + int dram_init(void) { return mxs_dram_init(); From patchwork Fri Mar 22 11:43:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1914842 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=uwTt4csk; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=ZRxQbdkT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1LBG4m3Gz1yXy for ; Fri, 22 Mar 2024 22:45:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F08E88231; Fri, 22 Mar 2024 12:43:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107826; bh=3GUiFC07m0qwr35rR07HyNFx8NNeFTHvBCC9w/+RMXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=uwTt4cskF0ck9InalTf0H2pDGEjCsX62VpFI651kISBSaa3YO3nkqstQWkdAY0Qq6 4RDiwpqZsFpetsMPu3EpInWvPHOy29knM9bbj0Fo3GaGmhgut+HshrSgTZH1ur3IXM eWcfNrp9w54YgKM55CaQ6bAQbxPQmYrFc3nUJf5MFiNSX2B87a8r4mx+Ds9iB4JxSe yOAapzxdQTtcjAAEUfXbbb72PM+g/vNcHuQ/5ZH9KzZLhG3uyl8pAkfHyTDxi9+BiC AxhjEUwtTD/UEVcDy4x3Rdn4tFHZGKSiFzmMsumtMUOdQ56OpN4FMxK4BGbb8t05mT gUJ7BoN3pW4DQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id C05D388223; Fri, 22 Mar 2024 12:43:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1711107820; bh=3GUiFC07m0qwr35rR07HyNFx8NNeFTHvBCC9w/+RMXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZRxQbdkT6hkBFNYR0No8zBLdj3hPlBag16LFgu/B04LyG2xjV/XvV4N+CnsHMTgPg 9TSnIX2dBTKKZBXk3OBFTHot0QYPLO03B1uC5q+xxbha3zjOWLwTN0W1w9E2T1uQGs 0XwzjmN2zFK5io5DFBkdVw6B9tToikQSMjlNQlQVm6zuEeH3MLrNqLf8MZ1g/SZwst jx5xVD8F14l+dHf9z3pTD68la6P3u6jHWG/eNLkMeCuBFTcLM0EIM/wfMHflM9fiq1 3E+de6FcQua3fZTSBA1UiRmBh7/EWmR27WVLoBw/es4Zhex7Y+J+OujvW7k4Fx4ldc Z2fDhB1k1oPTg== From: Lukasz Majewski To: Stefano Babic , u-boot@lists.denx.de Cc: Lukasz Majewski , Tom Rini Subject: [PATCH 12/12] arm: env: Add support for booting different HW revisions of XEA boards Date: Fri, 22 Mar 2024 12:43:15 +0100 Message-Id: <20240322114315.2720727-13-lukma@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322114315.2720727-1-lukma@denx.de> References: <20240322114315.2720727-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean In the scenario of recovery, the FitImage is used to boot the system. This patch provides support for deciding which dtb configuration shall be used. Signed-off-by: Lukasz Majewski --- board/liebherr/xea/xea.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/liebherr/xea/xea.env b/board/liebherr/xea/xea.env index ac6ac898ec..9dec4016a0 100644 --- a/board/liebherr/xea/xea.env +++ b/board/liebherr/xea/xea.env @@ -112,7 +112,7 @@ sf_swu= sf read ${loadaddr} ${sf_kernel_offset} ${sf_swu_size} ; setenv bootargs root=/dev/ram0 rw ; run addargs ; - bootm ${loadaddr} ; + bootm ${loadaddr}#conf-imx28-${arch}-${board_som_rev}.dtb ; fi net_mmc= if run netload mmcargs addargs ; then