From patchwork Mon Sep 14 07:51:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363345 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=EIDhzJiq; 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 4Bqdq05WQmz9sTK for ; Mon, 14 Sep 2020 17:51:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 465FB81996; Mon, 14 Sep 2020 09:51:31 +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="EIDhzJiq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24C9981BD2; Mon, 14 Sep 2020 09:51:29 +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-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) (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 C8E0E808B2 for ; Mon, 14 Sep 2020 09:51:23 +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-lf1-x131.google.com with SMTP id q8so12375422lfb.6 for ; Mon, 14 Sep 2020 00:51:23 -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=TeXB572dLmgMPNDWouZSj8R8QAA5fk+Hzc4arnmq6qA=; b=EIDhzJiqPvWkH/A6np33qi8mVf2bl3n4fITKtgq5yIUFyKfoNU0LXYn5HgFjugA9YX evWt7Ps04jGtapT6Op2tp0tJEE46iEkq15PvAUzK33te92ffc1ntbM2y38CZN962xn/u n/V1cEkzZV2NjwLrDAFdTdIeJtrgg+WD+8YQ2lBjA7oVWGrvEgMh3QIUyDz9vHkFrMCI KStwGpITkIK/71JtPUS7T7LDknIom6PZnMi8aUA7m9dLe9T0oPibNZMInzYg2IIPhNBq WnWf/jF92bGsZwkIv6g7DqiCD9QkoSqouQgqL4PZ6zzeFTCGhIaIg7aCyrdcnQ/JS2OO uK9g== 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=TeXB572dLmgMPNDWouZSj8R8QAA5fk+Hzc4arnmq6qA=; b=Yms0R62KEJKwvJw/hQrDYehuALJymROsodF5BOMYaF7eniBM2ya2ZCyZMKXxWnJ8Gw iOe9M6QBUibJKrCF7RPsBWU1mB4iTDz87RdacOBFCIXK//1uqa8JIH+8N7usAC4XoJYR DjjIRdaCzNBGKfL7TmF1fbjp+kKmGmBapa+XAlXoWf+61r8L8YizaKESzXTbEgw1WJgj S2F0PPLWUUkCCBZw5tQNZfeIHoZjW9nzcu1JCNx8cBxt4P93/iDJsRazfldlWHNQtiKZ tasppHO4tHo+Y2+NJVQqS9fKuKOHKQFVZIB7FP5LBrTGYLATKY86I6mSDLrYhP1Co1v7 ldLw== X-Gm-Message-State: AOAM530cfBlnryw+Hoyuv3WNUTHzvvOqqlEFLZ7QffRa0ffDNX3QYMwW 1i5hTIhpX44HzsyYeUziRvhJf/YtIA0= X-Google-Smtp-Source: ABdhPJwueXkQfMjm/3Q4jlcUFReGRpkcc2O15OtHA2NpWiZv1o0IQ+eLuh+gI0z8cygthaZT7Aav6Q== X-Received: by 2002:ac2:59de:: with SMTP id x30mr3849150lfn.280.1600069882788; Mon, 14 Sep 2020 00:51:22 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id s6sm1902047ljm.8.2020.09.14.00.51.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:22 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 1/9] colibri-imx6ull: use splashcreen value instead of legacy function Date: Mon, 14 Sep 2020 10:51:00 +0300 Message-Id: <20200914075108.14537-2-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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 Set proper splashscreen env value instead of calling legacy function to show embed boot logo. Fixes: 391c712dde("colibri-imx6ull: show boot logo") Signed-off-by: Igor Opaniuk --- board/toradex/colibri-imx6ull/colibri-imx6ull.c | 2 -- include/configs/colibri-imx6ull.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 89b99a0b74..45f8da3c42 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -173,8 +173,6 @@ int board_late_init(void) #if defined(CONFIG_DM_VIDEO) setup_lcd(); - - show_boot_logo(); #endif return 0; diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 2fdcdefa32..530240f069 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -111,6 +111,7 @@ "fatload ${interface} 0:1 ${loadaddr} " \ "${board}/flash_blk.img && source ${loadaddr}\0" \ "splashpos=m,m\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \ "vidargs=video=mxsfb:640x480M-16@60" From patchwork Mon Sep 14 07:51:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363346 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=ZBhyz8nf; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BqdqX0XGBz9sTK for ; Mon, 14 Sep 2020 17:52:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9C298822E8; Mon, 14 Sep 2020 09:51:37 +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="ZBhyz8nf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E397381BD2; Mon, 14 Sep 2020 09:51: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-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (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 4550481281 for ; Mon, 14 Sep 2020 09:51:25 +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-x235.google.com with SMTP id k25so17785379ljk.0 for ; Mon, 14 Sep 2020 00:51:25 -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=OtJjvc9RgS4+a65LZs7ZQPXvue7fWlSK0hnxMe68kd4=; b=ZBhyz8nfLdzbUT6hbg11BU44vC+2riGaLTobOKhDiBdpT1phN6hMpXrejacCpJp7Nu pIW5eLGuVR9m0BvcnltL1YM5QTOgY1ALPLqI1VAP3xxn7XAXb5PScupEP1Ygp5W5aeB8 RgvRWSNtgVih09ckx6SWvrvnMpDSeqR7dnERuxTcXgvAX6kupdBgbxcuV1lS6W3ASbTk hzvdiD7lJFOllfIBD3ExG+i3NP/Si+lDOnYzNayDBs4KETF1eBPL+kTCKazKnpj8J+VS aRkqXEv285DBKtlVFxHEmSc7o+qvWY8ygbfrz+jX4UZ/a605xACpqf6+C3nqSejOzk18 igDw== 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=OtJjvc9RgS4+a65LZs7ZQPXvue7fWlSK0hnxMe68kd4=; b=Wd5pW8iOYG6CJ2ytzKTApiR5/6UBq9m6mtDhsmU8gkv/SNxADJ/5ISjPBsDQZpSKyi ZKFGmoLyosRsDsZEaCo2/yiKo5xW8olMqAmsQiRNVhOsAV+8VEIPDFQJQ4c/E35QR4ke o+pc4GTz8v6qm40QwAtcr3oYnC51uiVjHbn9igEihK9S/WBGKfJFSNyOtf+XNKDDkCee DFXI+/htJ9g94dTDJPyzQ9y0utNg/M1IXKA0M6iWF86cHPndaVa5QyrIMo3nQw67Dmrf NqAIRJcLn5HRS/SpGH2Z4v+sQdmfx5v7j6oA9bI2pCBa6YRvSkyjIaBLXbYeirYALtTV yRZQ== X-Gm-Message-State: AOAM5311FpUwt9IwXX4cMKe+QiSMELiB7wHCrgahFXPviL6+WYdmiDaK a/jEFspkPC8GVpD89qKcFlCg5YLuVPE= X-Google-Smtp-Source: ABdhPJwEM8fxYsgOxOfqZGH6Psxg5XvHfsF1hkpTONyPgER2Yw1EYV0cESut8736RU2Xry0TUI9zQA== X-Received: by 2002:a05:651c:110:: with SMTP id a16mr4622604ljb.110.1600069884286; Mon, 14 Sep 2020 00:51:24 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id j28sm3554880lfk.97.2020.09.14.00.51.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:23 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 2/9] colibri_imx7: use splashcreen value instead of legacy function Date: Mon, 14 Sep 2020 10:51:01 +0300 Message-Id: <20200914075108.14537-3-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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 Set proper splashscreen env value instead of calling legacy function to show embed boot logo. Fixes: 195011b24d("colibri-imx7: fix splash logo drawing") Signed-off-by: Igor Opaniuk --- board/toradex/colibri_imx7/colibri_imx7.c | 2 -- include/configs/colibri_imx7.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 14df3fc42c..b087cb0dc7 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -356,8 +356,6 @@ int board_late_init(void) { #if defined(CONFIG_DM_VIDEO) setup_lcd(); - - show_boot_logo(); #endif return 0; } diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 79aa735ccb..8cc5a36996 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -173,6 +173,7 @@ "fatload ${interface} 0:1 ${loadaddr} " \ "${board}/flash_blk.img && source ${loadaddr}\0" \ "splashpos=m,m\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \ "updlevel=2\0" From patchwork Mon Sep 14 07:51:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363348 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=EOZZCaPv; 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 4BqdrJ3Qk5z9sTK for ; Mon, 14 Sep 2020 17:52:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0AFD082315; Mon, 14 Sep 2020 09:51:40 +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="EOZZCaPv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F36A5822FC; Mon, 14 Sep 2020 09:51:37 +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-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) (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 B65D281EE4 for ; Mon, 14 Sep 2020 09:51:31 +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-lf1-x133.google.com with SMTP id w11so12364264lfn.2 for ; Mon, 14 Sep 2020 00:51:31 -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=NEOQWpLLa900+5cSKkwbgMrBjwy0W+z//GLysanX924=; b=EOZZCaPvWiHKHQ+WOp0lKsVkCRjWZpYX5icRIUObNAepCEMNb/uWXidKBUwJQnFLrG lChAzsG6DSWinsSez7zN8CTVa0URXFvaAgjqqv0lB5JHLpTtIQrsZ+yDN7mzkUtQE2S7 YN+OAhQNMjJbPxuNdHAunKJerRiIgaV9kuJi/nsbXHbTQ7QkpenHi1efAOIaNBdPk/Y5 mKmyeTFhDwxKRJ8PI7cr2GZjEwZE4wmcGE+MgWU37avs5zd+jrzlytO2y9yQ+ckzFFdV KSB24Bd9uoO2173Jp4EYtLrGSaoIuMfKfKy7GIcX4E7RLC6CazjIUUt+xjsFzun0WmV5 MPmA== 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=NEOQWpLLa900+5cSKkwbgMrBjwy0W+z//GLysanX924=; b=iplvvwJGv6BMvoT/fhA8/cE5G8XvsXw0NgWYdISJvc9lc/WL/hCioAWOipuhaLGLXI l1oh3lEjh9q2kRQzMcjmtDLTDVBHAuuXtLQDGOpIhOQttwcn6OeIUJ31gzRZlyEitI/O oXjpdYCZxXpQIK10e3R4Dc8T4CvBGcX/PhZ6kPheWTuFPlyP250oQbowOydEi+jfEWWW ChgQ0LVZx7fElJnV9xAeYwNKdP6zd1gYvrqA1CjcF+FBgC76KuFgYqIpDJ8f58pL65PN lCa3VA+k+becGOAs/FxBtc0gl04OX+7U0ieQkYcZXXEMKiFb4swTzKcrg5aWzpO/LUt5 gEvg== X-Gm-Message-State: AOAM5335yBmQtj5+XDWuK7OZ91TNwbMNRV5Lcp8MYRDIbg22r+x1dv7y TfORs0kaXwpW2hi9WAlW1gn0V9Ecqw4= X-Google-Smtp-Source: ABdhPJzGfEtZ1f/WbAjkRXmUcZAHsP7JkcEmIcKLTiDGOVfLdohf1OHtzZ7j1NsO3Gp4tgr7L8WXjQ== X-Received: by 2002:ac2:560e:: with SMTP id v14mr4249896lfd.517.1600069885792; Mon, 14 Sep 2020 00:51:25 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id v196sm3593571lfa.96.2020.09.14.00.51.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:25 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk , Masahiro Yamada , Simon Glass Subject: [PATCH v1 3/9] toradex: drop legacy show_boot_logo function and use splashscreen Date: Mon, 14 Sep 2020 10:51:02 +0300 Message-Id: <20200914075108.14537-4-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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 Drop show_boot_logo legacy function, as splashscreen functionality can be used instead. Fixes: d324189772("toradex: common: show boot logo") Signed-off-by: Igor Opaniuk --- board/toradex/common/tdx-common.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index fe5295f94b..a3d287ed5e 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -203,22 +203,3 @@ int ft_common_board_setup(void *blob, struct bd_info *bd) } #endif /* CONFIG_TDX_CFG_BLOCK */ - -#if defined(CONFIG_DM_VIDEO) -int show_boot_logo(void) -{ - struct udevice *dev; - int ret; - int xpos, ypos; - - splash_get_pos(&xpos, &ypos); - - ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); - if (ret) - return ret; - - ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, xpos, ypos, true); - - return ret; -} -#endif /* CONFIG_DM_VIDEO */ From patchwork Mon Sep 14 07:51:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363351 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=QUjnprFy; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BqdsF4RwGz9sTK for ; Mon, 14 Sep 2020 17:53:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3286682337; Mon, 14 Sep 2020 09:51:45 +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="QUjnprFy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5110E8231A; Mon, 14 Sep 2020 09:51:40 +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-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (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 28CED82199 for ; Mon, 14 Sep 2020 09:51:33 +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-x243.google.com with SMTP id n25so17782116ljj.4 for ; Mon, 14 Sep 2020 00:51:33 -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=HL9JdwhAAycBk5dGW6idvMuhkPp4V6B7//FElKEG2XA=; b=QUjnprFy2yTsYifqBYi98ZaEEOzfDOnwtA9gTLTwhUgZD/Ok6WEc0w4QM7EIDqEgGD jjsGI4WpMQ95T5QWNK9viM0IBu2A4medIe4M9ZxqmJrOxTqZTIFxUy6JZrBditzCHQbz dksqi1qMEj0BwGe42QhE6URMoq5X0cAWk0Dmys2ljsNlm/2wVVKxq+xUMRJkRxm8nwdD mxzI78GOcjA+r5wravhy3CEPXio1DLPC9+P2KiFlUN2pxE7owthkeCnxro4HcF4J33Va 4SxPRIYFsR+YEQ8PiDFQ8HWEnZB4QkDFisxjfzgqbT+fyPqvjwO/5BnPiQ8QFRjewGfx BVHw== 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=HL9JdwhAAycBk5dGW6idvMuhkPp4V6B7//FElKEG2XA=; b=kvuEcJaXtqP7RSET1bNh7ny8lcCgkmCZto1maYovvJsl3yoEI4pinweoIPra3XEhQc NjBJTZW8hgw3Fj+QXNhKjHTKFGObXPQ/BSxGZzfFjY3DymtNi/mwiqeODa0MUMwQRm8T VS68GQR+vom7Ms48sAVTg4WSzV1yNtZLIbHvnCEeNCKXeif2RWTxQX3WPjUkY3VyO7QJ EW1/ToKUZkzxFr+ofyUDO+GXpI+a3gYd3q568oikDBY9TQsnNifYMnMnS6cyI94WhEU5 In8l05jnIzNa4Z1cV+Ify8yZoojC5ixhF/vllwuX7mokgrIFCmC80Lo9EzAbTNz4D57F wqyQ== X-Gm-Message-State: AOAM531uQHu03+fU/Eho+MeW7mh3WzYHkTb47mY9n2+/EPidK/K7zNYB ifw3Ndp1PzZyyjQQfok7hnrztyagYvo= X-Google-Smtp-Source: ABdhPJyi84PoGSqTWbmi8ZeXmir/opfcDSjwPMhUe2zytEIdObnUpB+yZTAJWjKfgu82sfEgH4KKlQ== X-Received: by 2002:a2e:e1a:: with SMTP id 26mr4130171ljo.377.1600069887207; Mon, 14 Sep 2020 00:51:27 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id b11sm3554198lfo.66.2020.09.14.00.51.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:26 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 4/9] colibri_imx7: wrap video specific funcs with ifdefs Date: Mon, 14 Sep 2020 10:51:03 +0300 Message-Id: <20200914075108.14537-5-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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 Wrap video specific functionality with ifdefs. Fixes: 195011b24d("colibri-imx7: fix splash logo drawing") Signed-off-by: Igor Opaniuk --- board/toradex/colibri_imx7/colibri_imx7.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index b087cb0dc7..8afe1bfd5e 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -133,8 +133,10 @@ static int setup_lcd(void) */ void board_preboot_os(void) { +#ifdef CONFIG_DM_VIDEO gpio_direction_output(GPIO_PWM_A, 1); gpio_direction_output(GPIO_BL_ON, 0); +#endif } static void setup_iomux_uart(void) From patchwork Mon Sep 14 07:51:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363347 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=dq6MWDch; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bqdqz3lytz9sTK for ; Mon, 14 Sep 2020 17:52:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C776B808B2; Mon, 14 Sep 2020 09:51:38 +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="dq6MWDch"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52A0A821ED; Mon, 14 Sep 2020 09:51:32 +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-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) (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 BF1A4808B2 for ; Mon, 14 Sep 2020 09:51:29 +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-lf1-x144.google.com with SMTP id y11so12357738lfl.5 for ; Mon, 14 Sep 2020 00:51:29 -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=o7XJcVTQNl01iJDc0w69uaSI+MwchbaR8nCuQEB2ykc=; b=dq6MWDch+84DxrKPmpTOsP1f8qiwJbg65vP+mREnW2TiEedjZR4S1WkyFkRpDqbhf5 L90BcXiOYeuasornXwwEqgPmRgPtj+mjiXgVmUeNncnRsoHP56fCzma621JQjOBAj/As 7nbat+Xlq5Uq5drpFz1YaQ9QQ5ICU9LRYPawRYI1yVYgJCfNELeFrbwEqYziU+zcmNjI /pwGsrubVoXs3aRBtlCsYNmHfiRuLFYeDGt0RnKGz3ItBk95nxu1yZ1/+dtGZfq8shJG lWdnJsAhzEI/JC1lIQ8SteefWB2vusg5sHmzK57waBvGNeFogosxV4SrOTo6NykqHHQX l7CQ== 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=o7XJcVTQNl01iJDc0w69uaSI+MwchbaR8nCuQEB2ykc=; b=Ox9cLo+9Gt5nTa5McNjPN94F07SNuxETLO1DKHEOV8pGNUERXW6ldMOlnJSaweq+GO iVno0jNTKE4YhK9Wp81gzPcsfzdWEBP3eZGoN3uxLn7SHFdNC9JgGMNM4KwOgprxB5tv cza0OddO/snIgegxz4NC18FhYf/JK9mA9fSM67F1HYaIdqfyv1GQVZw1iXwqBIixWjqr VNV9jlRX4C8rvl2tUGB/JtgHLUitQ0RUUz1vb9BMaOzKDez746UFqi+qfF6QGz+nFUkN YnUhbh2RKWPl3BFPEngP2LTQlfOhuR8eJgZ2WsI74qPkCb+IuWSdcRO0cJZTG62DIq4N LFIQ== X-Gm-Message-State: AOAM531/Zb0Uv5Jm9D9aaATJiN1vqQjMDW44TXJm2zmwc0M4zN2EJJp8 SRiVTYyM4ZmINb39Pfs5E9qPN00yEKk= X-Google-Smtp-Source: ABdhPJzczZS6NMx6yldcVf46SZ1Kej8BSm1izO26Q/IiUDNSn6Q39I8ucHSi6msUSQlE96IxzSXB1w== X-Received: by 2002:a19:8148:: with SMTP id c69mr4481645lfd.295.1600069888662; Mon, 14 Sep 2020 00:51:28 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id u10sm3546249lfr.33.2020.09.14.00.51.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:28 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 5/9] colibri-imx6ull: use preboot for fdtfile evaluation Date: Mon, 14 Sep 2020 10:51:04 +0300 Message-Id: <20200914075108.14537-6-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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) \ From patchwork Mon Sep 14 07:51:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363350 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=imiZXevr; 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 4Bqdrv3kDTz9sTK for ; Mon, 14 Sep 2020 17:53:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DFDF2821D8; Mon, 14 Sep 2020 09:51:41 +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="imiZXevr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C93C5822FD; Mon, 14 Sep 2020 09:51:38 +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-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (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 4D14B81BD2 for ; Mon, 14 Sep 2020 09:51:31 +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-x241.google.com with SMTP id v23so17829922ljd.1 for ; Mon, 14 Sep 2020 00:51:31 -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=+jgRgbsd0eQr9IIIWpvlrpBXl9E2TspCMOCX+PizxQ8=; b=imiZXevr9aMMeeR2owER4jgaLvWEN0xDzh6lsKyD3FxKGp+sxixUHkVQAZhe6Vl0on Hd/18ZPBZE3aisZcB495TOOrWpong3mAtTqZ6vN+tav7Awtp2bxjiFap2GOSzCSLUnBn LHt/guAO5ZcjD9KRqaQhfbS2QNpu8IUY3WEHJdJ8VTJU+LgcK5lWYKcZ3ORwulEKvxY9 c5KSdsCsvxNUMxH2wep2kiZOzUSsL66H4UH1Zk+ewk7qmnboEweMi4zw1YB5FqD7OsDr VsjTUPuwAdvW3l1ThPNepvX8WKJa9HCUc6s2fd2NZ7ZjvJBKkA9YUaqMS0iwqmDms9Kp CdMw== 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=+jgRgbsd0eQr9IIIWpvlrpBXl9E2TspCMOCX+PizxQ8=; b=mUeLCaSP9SqrmENY2pRjqsFldM4LzP5EuJyJMC+dVmkbaANqFssY9EOwS2HdouVbDm j2YyfSDol/NG9edW1mV4yNNsO/eEcjrz4Wum4/KdhaNqtfzbtNm499EhyoUzM58P1AMQ rj5IT/cV0u1VOAOi4c5BAibEDymX+RsztvfdeHwV17xfSJNM+0Sq4d1KvoXmLIL593TB AKEE6HepRj7eT78d8cjYu5+elAQUUGZwP20bhdOEYfuc2/0CKOmfhmvJRsmeBEcsWxVQ Ub5++k2NGnJgwyYUnHHz95tdI7Bu6BEr9nNvw2eq02hfUz6PSpyU2ekG68ZXP/j0kzyW cUgA== X-Gm-Message-State: AOAM533LwbED99yMguPW8GcirzBynMAPYT3yJc2OnZ05cF++iiuVBpYY Gnobesr4RAjIpp82UX4GeUw5Lye/DXw= X-Google-Smtp-Source: ABdhPJwtcF9WJHvjXNfqP+DsEuks+FbSwCdDbU4qYEXq1i4fOYs6JXZvGl6mUrle/bmxzhHti7xGSg== X-Received: by 2002:a2e:9dcb:: with SMTP id x11mr4909944ljj.450.1600069890280; Mon, 14 Sep 2020 00:51:30 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id f24sm3901351lja.104.2020.09.14.00.51.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:29 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 6/9] colibri_vf: use preboot for fdtfile evaluation Date: Mon, 14 Sep 2020 10:51:05 +0300 Message-Id: <20200914075108.14537-7-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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: 304042c1f3("colibri_vf: set fdtfile for distroboot") Signed-off-by: Igor Opaniuk --- configs/colibri_vf_defconfig | 2 ++ include/configs/colibri_vf.h | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index b145b9f699..def64b1043 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -11,6 +11,8 @@ CONFIG_TARGET_COLIBRI_VF=y CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb" CONFIG_BOOTDELAY=1 CONFIG_LOGLEVEL=3 CONFIG_VERSION_VARIABLE=y diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 86d4621f85..cae7c14bfb 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -76,8 +76,7 @@ "ubi read ${fdt_addr_r} dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" +#define CONFIG_BOOTCOMMAND "run ubiboot || run distro_bootcmd;" #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ From patchwork Mon Sep 14 07:51:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363349 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=Z3C5yz3G; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bqdrb3sQsz9sTK for ; Mon, 14 Sep 2020 17:53:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0AA682317; Mon, 14 Sep 2020 09:51:40 +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="Z3C5yz3G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D970822FD; Mon, 14 Sep 2020 09:51:38 +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-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) (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 9C085808B2 for ; Mon, 14 Sep 2020 09:51: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=igor.opaniuk@gmail.com Received: by mail-lf1-x143.google.com with SMTP id b22so8788510lfs.13 for ; Mon, 14 Sep 2020 00:51:32 -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=J2RCh/fcokn8ShLd871sZB/AWqSBQwbIRbA1955/ibM=; b=Z3C5yz3G5FyQOOXR0wz0KmbBCkWzTlZcB4y8NiMVZSDvO9WJSROzL27G1Ovuxcb4Bx gUqGhAcXlHtAfPofYHHnPqqAwCu60Imal0UMuPy0g+/rex8DkI33EeyYVRXNpnbVMwE8 QzEJGsgbibGysOutISZXbWEg/fDRngaAYTulbQzndakeHF5qqc4GyhqzDRN1KyXCQeqX PQmO4BnM8zB96fW0tI9Q7mO7LGr3X8fMssww6Gd1Rdm2/IqBHVJmvVowLqAlLinXPsg8 BNPm2/O52QER1PTROLgPo27shp2GphAvkSWD7O8CUI4Y8N6LOYpKdUwsk4nCAN9C98Cb YeNA== 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=J2RCh/fcokn8ShLd871sZB/AWqSBQwbIRbA1955/ibM=; b=b7Zz9crd1e93/QOBPMfg5d8nM9budbxowf/pMYyw2QM813zB8izZ//+EGRuHwmsTfv J5HZqMuUJFAKRYrhO6Sr2ugo5Yz8I5z9GsSqFZsm9/IKHLu4AZ7ZFtDlN3ucKZJn/AsK 5LMZM61fQxKYO/RTxfQowTi2YMZaj53EZCwrNYMFN0hvRtdbRgnFShXh/JQOCLrVvERW GvUo+1ve9njBaGNvE/L7Gj8+a5x7NPmhY9YHECopu2ifo/vqam2sPXGRGWe9V5z5yWV1 vKUKwIIMpvUHtt5y4PL8UY8lexeTWnvugpck6h59njSlpH33CdlVF71na6o/xCUbLlbf m+BQ== X-Gm-Message-State: AOAM531BcpqgnTpACxGFCUBZdQyV/8wfwTF7LargjiytbIiz6UU8ZABM eqAbrY+RMYusQx/9GOLYwEaVjVaDYSo= X-Google-Smtp-Source: ABdhPJxfBkUQehFYixvLRGdu2n2W75pFLJwo9BaigCo5ZR3BMXHmop3x7jCYzM1O26SYKOlHjtMIHQ== X-Received: by 2002:ac2:4ec7:: with SMTP id p7mr3516956lfr.352.1600069891680; Mon, 14 Sep 2020 00:51:31 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id z8sm3909984ljh.19.2020.09.14.00.51.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:31 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 7/9] colibri_imx7: use preboot for fdtfile evaluation Date: Mon, 14 Sep 2020 10:51:06 +0300 Message-Id: <20200914075108.14537-8-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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: a62c60610f("colibri_imx7_emmc: add Colibri iMX7D 1GB (eMMC) module support") Signed-off-by: Igor Opaniuk --- configs/colibri_imx7_defconfig | 2 ++ configs/colibri_imx7_emmc_defconfig | 2 ++ include/configs/colibri_imx7.h | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index f33ca11a4a..a13a4bcda5 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -12,6 +12,8 @@ CONFIG_IMX_HAB=y CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand" CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb " CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_CONSOLE_MUX is not set diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index e4b0c99d4f..c8b6ce79b0 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -14,6 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb" CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_CONSOLE_MUX is not set diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 8cc5a36996..76088d53a3 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -118,13 +118,11 @@ #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) #define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" + "run distro_bootcmd;" #define MODULE_EXTRA_ENV_SETTINGS \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ UBI_BOOTCMD #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) -#define CONFIG_BOOTCOMMAND \ - "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;" #define MODULE_EXTRA_ENV_SETTINGS \ "variant=-emmc\0" \ EMMC_ANDROID_BOOTCMD From patchwork Mon Sep 14 07:51:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363352 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=fCXRyIFO; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bqdsh1hFhz9sTM for ; Mon, 14 Sep 2020 17:53:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 412308233D; Mon, 14 Sep 2020 09:51:47 +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="fCXRyIFO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 89CF881EE4; Mon, 14 Sep 2020 09:51:40 +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 067F981EE4 for ; Mon, 14 Sep 2020 09:51:38 +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 r24so17818482ljm.3 for ; Mon, 14 Sep 2020 00:51:37 -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=AW3IliXnNMw5xDBb4W2R1nqoY79sQUzLO/mtxF5Y7lA=; b=fCXRyIFOWtJ69+hFImKLDeL2OY9C4ICzOecyxUHp46kbR8uv9x0klyWgZ5YnEDNjoO KIbyAdQJ1Gkf9CTEadABpevJNERudbT+snDzwot4YL3wxQ2+8V0UeWibmumuV0dThIJ7 IPPKv/7KvBbxUSZasCEbKHToIurd72IFeWVUGdvtC9JHA5aaybbIi44YNkBSI8GfoH3a gUOn9je71NXbFN2OFpSPDAO0GdWs7CiYJCYFtz9tz5kHT6laNLlvePG+GNT7jwcsLqWc BDuxR39doW7XcXDX/8LAh/csmermGXNV4GLTqfXp2OwHVMfaxPT0FaF988pVskzD/8Fj fm7Q== 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=AW3IliXnNMw5xDBb4W2R1nqoY79sQUzLO/mtxF5Y7lA=; b=mWErMPsDzyrDT/YkBhAoZEPJW4A72t4FidN72uafs2meseG+T+KF3Qp5lL4GNnwCoO 3eQpI8Ad3aHwCcKu2fLhRQI3jfYipylTTcgw+chekG53jQBxGqK3Diov9iLRA8hmSNtC 8IfPqV08p/DiHavToEJt0lbEwW8BImtcZuyLyJrlTMJLtkNDD6aijdpDuq08glrZS+ih /0ji35Bkm0V2GorG3mi266vvYgvXSDJXH117TBLP9xuf5eQ6hpK6fqOO+BLuFn650UZ2 /rGv1YE3f0D8DQj2PloqnpDVFt97ruOsNNHqqsjnskW22WU3SjqqHoINOnkVKgN+yFER YdyA== X-Gm-Message-State: AOAM532UT/I92+B/ZYgLCpjsejXkjfe6i4dusgQEN8vbtGe+WZmUGeV8 Leyk5cCrbe+1w8rBvW4qIzXMHdxWdB4= X-Google-Smtp-Source: ABdhPJzhXLw+eTtudjV6HzwTk2DWC3W5m1vAMMyIRVJXZPlnFobhTIm+OMdG+h8Tb4/I6KQVHQ9qQg== X-Received: by 2002:a2e:9d8e:: with SMTP id c14mr4637453ljj.135.1600069893121; Mon, 14 Sep 2020 00:51:33 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id l11sm3147434lfk.113.2020.09.14.00.51.32 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:32 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 8/9] colibri_imx6: provide fdtfile in env instead of setting it in runtime Date: Mon, 14 Sep 2020 10:51:07 +0300 Message-Id: <20200914075108.14537-9-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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 Provide fdtfile value in default env instead of setting it dynamically in runtime. Fixes: 85cb2bc686("apalis/colibri imx6: provide proper fdtfile value") Signed-off-by: Igor Opaniuk --- include/configs/colibri_imx6.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 13b03a594e..097e620de4 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -118,7 +118,7 @@ #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \ + "bootcmd=run distro_bootcmd; " \ "usb start ; " \ "setenv stdout serial,vidconsole; " \ "setenv stdin serial,usbkbd\0" \ @@ -126,6 +126,7 @@ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ "fdt_file=" FDT_FILE "\0" \ + "fdtfile=" FDT_FILE "\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ From patchwork Mon Sep 14 07:51: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: 1363354 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=rjvzroSx; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BqdtG0js8z9sTM for ; Mon, 14 Sep 2020 17:54:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 98598822FF; Mon, 14 Sep 2020 09:51:53 +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="rjvzroSx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 054AA822FF; Mon, 14 Sep 2020 09:51:53 +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-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) (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 7839382314 for ; Mon, 14 Sep 2020 09:51:40 +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-lf1-x142.google.com with SMTP id b22so8788678lfs.13 for ; Mon, 14 Sep 2020 00:51:40 -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=mLDBOBivjqzHas1w2xv/FNddkko7UmmuZG+O4OyWLeI=; b=rjvzroSxGYbdy/Neyg49LGzst4eQZJgqNFde7rjYkUgPRrTVXhUG8T2Q1BiHxZyAhN JYb8XqTNn9OA429ul/1KTlu16VvhcmHILGnuoCB751AsAiCxq67or1tjFEgR+C9leQn6 /1Votuut8DfEzUSSCDF3H/vVYul9O+WIWJ0jPree+kEeXc8vRLW2SktkH+vBnbB8fsqk rOCUGu8ehyShWkSNs3ZyJFXw2sDO67Y3IRYALCL2b8Kcw6/wO3HzJRRJmR4maNCur3pg Xp8E1nqVKXoOpGr5RX16PAKfJq2blH0NP5syLu/Y/tKTSfesVnW2rhLCoi7qJVX4J6Tk kynQ== 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=mLDBOBivjqzHas1w2xv/FNddkko7UmmuZG+O4OyWLeI=; b=PwHj08g8MzPT4pA13yEIOkIBQoR/bYpWpYCjU+JeFqbCHzitSW4jHP0jrMzF9D0tMO sXlic4Snu3TP2rls1zcQdqHVWwE/3Mk6gl85MYmrojgfUN5FhKaIwXKh6Y403cTiZg3s N6zPd7DIXCN2dlAEuzB7Tt+DtjsXFxb/D9j0Yl/LPnkSrAMdZShHapJHBupXWeq8+IPV bznkxJn8K0UjMnfyfbwXAWsWrA4bSoOgm2xzqafaKDB3joQHGlBTqB3U+nH9HD9UHxgx +ghxY+z/lPoNbK8QJaYzmJPPqV6X9103YaqMu8/f3cG6Qf2PUTfAosD96IK+GlSDTTWS PMcQ== X-Gm-Message-State: AOAM53162qYmz01wrN6CS1ZPVsNV6dQk6RgBwMk5It9EzgO5pofl/RrG gWUShjIPVF/ZG9jTD9SEWMf+VQWvRWA= X-Google-Smtp-Source: ABdhPJwU6GcqklKrutUlVND5oY+C/oSkGz2CDDRIOt3fQ50NXmkAOJIRBYiWKys1E5pPCiiqumSFeg== X-Received: by 2002:ac2:4e96:: with SMTP id o22mr3556353lfr.485.1600069894587; Mon, 14 Sep 2020 00:51:34 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id u23sm3907472ljl.86.2020.09.14.00.51.33 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 00:51:34 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: Oleksandr Suvorov , Max Krummenacher , Stefano Babic , Marcel Ziswiler , Stefan Agner , Philippe Schenker , Igor Opaniuk Subject: [PATCH v1 9/9] apalis_imx6: provide fdtfile in env instead of setting it in runtime Date: Mon, 14 Sep 2020 10:51:08 +0300 Message-Id: <20200914075108.14537-10-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914075108.14537-1-igor.opaniuk@gmail.com> References: <20200914075108.14537-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 Provide fdtfile value in default env instead of setting it dynamically in runtime. Fixes: 85cb2bc686("apalis/colibri imx6: provide proper fdtfile value") Signed-off-by: Igor Opaniuk --- include/configs/apalis_imx6.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 9bc70f979a..4cffc7f887 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -135,7 +135,7 @@ #endif #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ + "bootcmd=run distro_bootcmd ; " \ "usb start ; " \ "setenv stdout serial,vidconsole; " \ "setenv stdin serial,usbkbd\0" \ @@ -143,6 +143,7 @@ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ "fdt_file=" FDT_FILE "\0" \ + "fdtfile=" FDT_FILE "\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \