From patchwork Mon Sep 14 08:01:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363378 X-Patchwork-Delegate: sbabic@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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=e9/VoBDY; dkim-atps=neutral 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bqf3s05Rdz9sSP for ; Mon, 14 Sep 2020 18:02:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 60DA482337; Mon, 14 Sep 2020 10:01:44 +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="e9/VoBDY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C732E822FD; Mon, 14 Sep 2020 10:01:30 +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,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (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 0E0348230E for ; Mon, 14 Sep 2020 10:01: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=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id w3so17789034ljo.5 for ; Mon, 14 Sep 2020 01:01: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:in-reply-to:references; bh=aZQ78/N8ewrjSRTjZH+Ht3bkUjaJLqH95lNRAys3Jpc=; b=e9/VoBDYO+vx+EvToe6JkBMwecoFnb+ve7we8Tb9m3ezpOe/iSqy1txaFc2k1bmmmk MrggcfotqXHM6eBrDE8GrPaIh7deZJTxYHdU85OHMpRjgyYtXtkvYznfcHrXenht2upZ H83viuR4WH77si8rbLf3QWjfqFGmRb5LnO3X8NDL2tCw6sc490d82oiOPJcH9jSAsElT A5KI6VvaGC9T7GEqYmJ8IHP5uLm7Zs0HMQwwsS3gE8xW2Y7N3KZ+oF+86qyOzsRiEVxo L3Td6hDmTaFfqw9rEiOzWoh71jKsdIu2FDLImJ3Vkz6/XXMRe/WYDbQGukFJsxfX8Ama C+lA== 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:in-reply-to :references; bh=aZQ78/N8ewrjSRTjZH+Ht3bkUjaJLqH95lNRAys3Jpc=; b=mUUHd0FvaNJbqBGubHo9Z4MEKvWZrqQC5fplI7UNUO3rO5PTZna90pjUl32f/67itC wzQhK20Q6vsKpK0zZ6jtk6TdmdspRkC/roe9c3vKMW/wNmlXi0cxM4HMPHGVHcbK848P wjMDdMGZ4QHcUuq+r9LkLAg0Wmd1uEIfjCKSpvekx3Ba2NcjqwKEDVseTFeJ6bcSCJ66 rQmLCShvtZRkAVgmMC2yo3yW/DCHSXD0K5ieJWj4CxIvkmtvEol/7EVDVmIVcb6sLe7+ ZwdCZ/yjWvXJkn8SjARHlfiUaG6OYLz1zt/L+V5p5Hc1qaibRamc780KNStg+DQi7sZd tJsA== X-Gm-Message-State: AOAM533vEac3bfvrHkAUbG8mFbIHXL/YejbTsH7PSjF5vETv1au7rM8U VAk+MtA3LrPJjOSOPtLK2j+UOXiJB30= X-Google-Smtp-Source: ABdhPJylNTt3nXqlaF5CZa5Dx751ePGcg5uy3nh3ewJeOBeU6pB+AB812lvx92elG2j7+xtmXmZ1Gg== X-Received: by 2002:a2e:7c14:: with SMTP id x20mr5090837ljc.220.1600070487005; Mon, 14 Sep 2020 01:01:27 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id n204sm3208189lfa.207.2020.09.14.01.01.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:26 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Max Krummenacher , Oleksandr Suvorov , Stefano Babic , Stefan Agner , Marcel Ziswiler , Philippe Schenker , Igor Opaniuk Subject: [RESEND PATCH v1 5/9] colibri-imx6ull: use preboot for fdtfile evaluation Date: Mon, 14 Sep 2020 11:01:08 +0300 Message-Id: <20200914080112.16665-6-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914080112.16665-1-igor.opaniuk@gmail.com> References: <20200914080112.16665-1-igor.opaniuk@gmail.com> 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 From: Igor Opaniuk Enable and set preboot var with fdtfile evaluation. preboot will be checked and run immediately before starting the CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp. entering interactive mode. This provides possibility to use different boot cmds in interactive mode without manual setting fdtfile value, as it it's already evaluated before entering interactive mode. Fixes: board: 31b1e17f44("toradex: add Colibri iMX6ULL support") Signed-off-by: Igor Opaniuk --- configs/colibri-imx6ull_defconfig | 2 ++ include/configs/colibri-imx6ull.h | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 3defaf0ccc..6ef5dff2db 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -14,6 +14,8 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg, CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_CONSOLE_MUX is not set +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 530240f069..63b3fef34c 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -35,8 +35,6 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 -#define FDT_FILE "imx6ull-colibri${variant}-${fdt_board}.dtb" - #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82100000\0" \ @@ -57,7 +55,7 @@ "setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting from NFS...;" \ "dhcp ${kernel_addr_r} && " \ - "tftp ${fdt_addr_r} " FDT_FILE " && " \ + "tftp ${fdt_addr_r} ${fdtfile} && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define UBI_BOOTCMD \ @@ -71,8 +69,8 @@ "ubi read ${fdt_addr_r} dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ - "setenv fdtfile " FDT_FILE " && run distro_bootcmd;" +/* Run Distro Boot script if ubiboot fails */ +#define CONFIG_BOOTCOMMAND "run ubiboot || run distro_bootcmd;" #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \