From patchwork Fri Mar 3 13:26:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751474 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=UB9fJWe7; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpm3129xz1yWy for ; Sat, 4 Mar 2023 00:31:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3007C85D88; Fri, 3 Mar 2023 14:30:19 +0100 (CET) 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="UB9fJWe7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A40B685D7C; Fri, 3 Mar 2023 14:27:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (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 AACE285D6C for ; Fri, 3 Mar 2023 14:27:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x530.google.com with SMTP id f13so10283147edz.6 for ; Fri, 03 Mar 2023 05:27:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UReZJcr0aMPEfSRwrD0z87+erWUlhU67AvK/pSpR9Tc=; b=UB9fJWe7oNPVKahh6AoYhCwh9EGmeBV3ImGlX/Gozv4P9dvFY04dzpQCwLT0qMN4x7 q9lAL/5xFkewYqKhRSM1j03CQGMfck9uhejOsIW0cJvwr/+k7mcmXzP1DVHSEB6q/cBf MSpT4WB53h9RMW0TeaH0LIsWnlMbg/aZl9pT1BRLHE+2tbqAUU+7iwRLRD6xKyMbeSkJ YXyyd/Bb4YGHDYDv6rVRaHeBgNvVOPVYuRCUmjurZStKn1iTI3M/qNm4njua501pK+Za km0ck5UGRPzKM8zjaHJUgBDNVRpu7Ks9TVX+4RuRdXDpgOJkZbq9MHRrXNq6W/+h/BOL lEjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UReZJcr0aMPEfSRwrD0z87+erWUlhU67AvK/pSpR9Tc=; b=JfX5ul57d6jP7aHXp/WeIglMoj3bAwfLE6mR7L+wFVWULrXKW2bOMfeteJJ56G7TlS 2/RWV828CYFCNBO+aBz4EhGrUwf6qwWTyYBB2sJ4BbZP2y4FLCOGIqvcAyhd/9omdEQF DWJAnTuYqQcIFNene3cWILFilc5IA7okcWQgWjTB7RqSXN4DCeHgYySuwQQhIge8gVRc H5HkRnII1+WJk9yPLQoTR9w8+rnPtOCarsvjKGy2oL0yL+x24sUQeqVWPyXSgUJ2NejC Q+2rkwAp9cl0XkZRm8AmCv3u0uAwmzkBl4PA5Pw3achAgfPdCcmHGmQ3eAjA1Y3B8lcQ dTWQ== X-Gm-Message-State: AO0yUKXGEC4HRYmnrf7BkMVX+mxJiS4mbgVKTDwp9BZkTKEXMUblVAHC +RyDBwauETuzHVSMPbFmnv4= X-Google-Smtp-Source: AK7set/uqDJd+1+80FCKz7hA6AlA8C72FwLsMW0QgKtBb6SopC4IJ3JNlW/6WNjSez75BvcPk7ykwg== X-Received: by 2002:a17:906:2da2:b0:889:7781:f62e with SMTP id g2-20020a1709062da200b008897781f62emr1571448eji.22.1677850028209; Fri, 03 Mar 2023 05:27:08 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:07 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 08/17] colibri-imx8x: construct fdtfile dynamically Date: Fri, 3 Mar 2023 14:26:33 +0100 Message-Id: <20230303132642.15574-9-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 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.6 at phobos.denx.de X-Virus-Status: Clean The following expression is used to construct the device tree name: fdtfile=${soc}-colibri-${fdt_board}.dtb - soc is set dynamically (either imx8qxp or imx8dx) - fdt_board can be modified by the user (eval-v3, aster, iris/iris-v2) Signed-off-by: Andrejs Cainikovs --- board/toradex/colibri-imx8x/colibri-imx8x.c | 14 ++++++++++++++ configs/colibri-imx8x_defconfig | 2 ++ include/configs/colibri-imx8x.h | 3 +-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 88eddbddaef..6ed9cc4fa80 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -123,6 +123,18 @@ int checkboard(void) return 0; } +static void select_dt_from_module_version(void) +{ + /* + * The dtb filename is constructed from ${soc}-colibri-${fdt_board}.dtb. + * Set soc depending on the used SoC. + */ + if (is_imx8dx()) + env_set("soc", "imx8dx"); + else + env_set("soc", "imx8qxp"); +} + int board_init(void) { board_gpio_init(); @@ -158,5 +170,7 @@ int board_late_init(void) env_set("board_rev", "v1.0"); #endif + select_dt_from_module_version(); + return 0; } diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 6a5c6e1d61b..6c1c9978d11 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -20,6 +20,8 @@ CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb" CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 7826596a331..9a4a5f3b5de 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -61,8 +61,7 @@ "boot_script_dhcp=boot.scr\0" \ "console=ttyLP3\0" \ "fdt_addr=0x83000000\0" \ - "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ - "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ + "fdt_board=eval-v3\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ "image=Image\0" \ "initrd_addr=0x83800000\0" \