From patchwork Mon Sep 14 08:01: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: 1363374 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=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=MbzXbx0/; 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 4Bqf3534GMz9sSP for ; Mon, 14 Sep 2020 18:02:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 12F5A8231E; Mon, 14 Sep 2020 10:01:30 +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="MbzXbx0/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BDCD282314; Mon, 14 Sep 2020 10:01:27 +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-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) (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 7B4BC81EE4 for ; Mon, 14 Sep 2020 10:01:21 +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-x22a.google.com with SMTP id u4so17756252ljd.10 for ; Mon, 14 Sep 2020 01:01:21 -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=MbzXbx0/R+a2uDXE3rkuIge2Vmyy9pFKyc9KmIZdkv9frFuMlmOXXpP7tQZm+9Etuu CKdBQ9sU7lDIGVbcaOYRnvzNdBg+dD2XoSBNyK5Cm06sL5nbv5obpA2R0P1jCfsgUpxI 4NLrWyRFsrTnXjiMquRIFZCpJGj7IsSvdbcCqpbjTCA6csuyta+m7mLly6LXoVc4ZrC6 D0Y16FqPbKRbGSOvpZGdaApcHtQdWAYJh8WbwAQfr4a10ST3/e7gUf367spnkaMrXDqx H9EMnxfm3UVXt3j1ppDnCcBxac+lDgJ4g0QqfCyaN5cyhbzI72H+t4okeR4ZUTIBdQR5 JaRg== 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=YWhmJNHssTslqigaaKRVfBK64sLK8Zrx/QyzAOvK+AfvKxskfXu2CqSbRhi+8jDSbb 6NQhrm1KVUTqaQsl7sPil+Q4Afzm1cQVJ/6V0sf6uST15PRwor2jCHXGUGNeLuu1T/Gv b6JLCLg2EyfZNc37E2/IzZ0gx3bH3jIriWFYwOIh9JuTXoYMgGYhrwxpHDDITlaCAUet P6D0nTbOt3sNLJf2qE/22kqR9wboMp6mrDXSevu2rVn5O3GCCOy9Vt+JxIj4fhrrReRP SrMYoX6Sx+MUDp29+9RrJpW8vIozoEVaynzCS1UTpdAsz6EdhvpGbQ21rMrqP6j2OqPX ZZ8A== X-Gm-Message-State: AOAM532mvIS1oBwGYA/NNEEoiSFF1oVY4ozMCYevT/kWvJWXp559aXG0 FPuU9UUj7SM9io2sVAvH0Sh6RIT8ZNQ= X-Google-Smtp-Source: ABdhPJzVDy8EMEQlLuJi0bhOX+3qeET0cK1i9icy5jMxRzqpZsW78P2PArJTJk4OSgSezGIyP0pOQA== X-Received: by 2002:a2e:9755:: with SMTP id f21mr4927908ljj.50.1600070480508; Mon, 14 Sep 2020 01:01:20 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id a24sm3489716ljm.108.2020.09.14.01.01.19 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:20 -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 1/9] colibri-imx6ull: use splashcreen value instead of legacy function Date: Mon, 14 Sep 2020 11:01:04 +0300 Message-Id: <20200914080112.16665-2-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 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 08:01: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: 1363360 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=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=dFXupyAR; 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 4Bqf2g6WnWz9sTS for ; Mon, 14 Sep 2020 18:01:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A1E73822FF; Mon, 14 Sep 2020 10:01:27 +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="dFXupyAR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C22A18230E; Mon, 14 Sep 2020 10:01:26 +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 55487821A4 for ; Mon, 14 Sep 2020 10:01: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-x133.google.com with SMTP id u8so12388855lff.1 for ; Mon, 14 Sep 2020 01:01: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=OtJjvc9RgS4+a65LZs7ZQPXvue7fWlSK0hnxMe68kd4=; b=dFXupyARpSemN5Cqv4JEy12wSdVWLwew9bAbhjumvPb8CIlWqZ3wLIyC1S86LHzCIa d/7i/mZlgl62fK61SaYHf8OMn6yEHNPjQXU0U2JnJyoTgaxIYo/DnmBYWMZR4B1WFD/F +QdMqraamIHgjCm9TyBHjXNSyEaqiv7Km8gSWmo0yiLseI7pa8qc23GB7LBZj7fDZ8S3 gs23qnV4INz38dD1ZzEffiP4AivYdf+9EEncMrZ0ID6YO5NThsbbhzw9np0gWiiyFDLS E71/Kp470Wa0E94iQNJhZc0J1znfN2AL8rLoZHQ3gnMeLEHrCeU1l+wBt7TB9mf/ejj0 kppw== 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=VPLrGr59K9nZ/lHMkdxawZ+6n65nXteYadmRBJz5/hYZ3LBJwPoahgN/fr9ZDXzknK TPOWxvODC2dPNbQczq6TgIG19xI5tNkdPRMTsO+uu9C89TPAsxsznLo2VPvF3a/DqUzQ yJn6T4ezwKyu5rPRI/X5NcdDvIzG49iEuJmT0w1SN1xhNNYTqXljl0kwAQ0iEvRQTtV3 Z6dInJVkYLeigR7ybw6Szrz4r3OSYyWSUVxQJ5jWa2pgayyAfv/GxdKcQs9Ru/Tzb1yy iXSZUlqivf8tWyskunbucR3VGCcjbaeVDUb3K0JKL1WF5EXV0jZY6Nxo8ZLOLtWEywG5 S1GA== X-Gm-Message-State: AOAM530xD+DJQJKmQARyL8NsgPigHCnmvNeRnWTboCy68bAUoaS/A2Rc hIqgFGxFedenGigw+pDKfH1lgfFH4TQ= X-Google-Smtp-Source: ABdhPJxfwfzpw8n2LeIbmVZaPWQlTJyvwt7p+YT/MawA4uYCoCTfO2mieKHb+LROo5BbpeY0oC8yZw== X-Received: by 2002:ac2:5f63:: with SMTP id c3mr3645849lfc.283.1600070482403; Mon, 14 Sep 2020 01:01:22 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id u22sm3932898lji.65.2020.09.14.01.01.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:21 -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 2/9] colibri_imx7: use splashcreen value instead of legacy function Date: Mon, 14 Sep 2020 11:01:05 +0300 Message-Id: <20200914080112.16665-3-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 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 08:01: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: 1363376 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=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=QxWrsMQt; 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 4Bqf3K6T0qz9sSP for ; Mon, 14 Sep 2020 18:02:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E6B382329; Mon, 14 Sep 2020 10:01: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="QxWrsMQt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 792E982315; Mon, 14 Sep 2020 10:01:28 +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-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) (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 D936E822E8 for ; Mon, 14 Sep 2020 10:01:24 +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-x232.google.com with SMTP id r24so17840434ljm.3 for ; Mon, 14 Sep 2020 01:01:24 -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=QxWrsMQtmVcXApvdRhow2CSZXFXL9+G/d3ybnAqOOK+99TAdaqT3EkkPtnMhvrAzZs N4E+5WvJ5Ebdi+/ZmjIkDhAGkYnKXmh7mANSPu5ufXjNK0j25CKO1/S5ffolu+DZh0hQ rJiKRMqtes8QXfU6xMouAG6EYYGEbo1Lkg+rx22R6OGYN9PI963+DggY93nuzh2xzGyr +NoSU8hUV8qDWaLO511SzHxKLBFykXDoOobtpXeQbLOxiJTxovcmrnz551kJR0sLhqSo sogjEb707hc7lAKUEx67qbA5ylE08lOfc4fDRVGoxpbU1LHkmKF1wSOZZydxNuLAnuq5 mRBw== 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=Znwijkto0A5+rqbyLT1Z3TLb6jxlH9YxHAr9hYyaStMXSN+8QxvhGVFWjiknz8poOo z9JtYflhG+Pv3PMsUyks2v01XuWHAiHKMIeHHcF0yXc2OWCa6Yr7tbio+IikP+8P91vK EAwx4twqTl0TdIl5O65neszym7rdFj1hqL67DdlRuCGJfynqyHC/dcgenwqdIkRaiPtp XkVqyCBoWTA2gWDYEDmgSzbOrCC8AszbBHtQ+pVLWH/FAFna4rXCN4BHcQu10t5qtEfR s3WTMfjXhMMCfdxyF8nJoEH+vvRSQ/xhbRyYOsMujpHEXEoJaibmit7H+GrDl0h03D6y 953w== X-Gm-Message-State: AOAM530ibbGsVpEc11SoFpQSkhey3IjpuQfU/buyuxYvmkwGd//+kRPJ PdjXamzNhsUxPDI3KyvTfKIGb4WenyA= X-Google-Smtp-Source: ABdhPJz6Cu/YDtXR8SQaDxzPN+RyBexYe6p/eLXC/fPtAYeLb0T+tLIjUdciQCfuK/Rzw6DiIgL3WQ== X-Received: by 2002:a2e:88d6:: with SMTP id a22mr4932518ljk.9.1600070483916; Mon, 14 Sep 2020 01:01:23 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id b7sm3172826lfi.123.2020.09.14.01.01.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:23 -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 , Masahiro Yamada , Simon Glass Subject: [RESEND PATCH v1 3/9] toradex: drop legacy show_boot_logo function and use splashscreen Date: Mon, 14 Sep 2020 11:01:06 +0300 Message-Id: <20200914080112.16665-4-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 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 08:01: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: 1363377 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=uwjOQVdz; 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 4Bqf3Z3pf8z9sSP for ; Mon, 14 Sep 2020 18:02:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CBB382316; Mon, 14 Sep 2020 10:01: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="uwjOQVdz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D4D1A82322; Mon, 14 Sep 2020 10:01: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-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (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 7482482304 for ; Mon, 14 Sep 2020 10:01:26 +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-x242.google.com with SMTP id u21so17798912ljl.6 for ; Mon, 14 Sep 2020 01:01:26 -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=uwjOQVdzEbKjzSkYqY4dR+D6w8Sf7xKrJiYtYcYUN938JFnkBGS4FISzk9CGCYSZMs 2oAb4zREhNUk6JbRtQCSCAjuQyQSHNS7XkK+iZKLR6dRYqhgNC7TY5sHcYCIraCe5zs/ sAHBrq+R5MHxmyMrJorugLHNCnA8GA+1zkyR7jWs0pYjiUTMZADA+1xdOgigRS10Oz60 QAica0YSbOb88QA/Z3iloL5+BjtIME9iCd0tzQ3r2CL2GN77xGW9L3JJkifPI9umS75m gJaT++mLkqMkUF0BIf2hHsc7lFksN3Oan6nm6e8NG8T41FR5vB16aJRl+m3/hjc6lDe5 wJkQ== 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=jcWEu4u4BHoSDMU+eLWKjKeinzj8x9tGGDbzA702riAoM0aU7IJpPpEyHfzWLsm8Nq y9TU+bcQUlvbres4KnoQT30yomHPMn1mfW27vxwiKeZpKSQzmcBPjpgetSU/6nNuolCm qo1bLYcSpsujHHK/pGYPFginBNvZ1alD1a7c5t1SuaZraJSzxEDd2Nba7qWvwikZbeqf Jts+q1b9nlEtaVI8QmC9VYPtyx2S6VNsrTXQWd1NrzpzYC0eigtoDOHemLZXFK9qP7v+ QIIjwBG9k2qQV+wsxxgpZVNSiAcHMYEMte/34ZqAANpHa0sjxDsMjIFov4bXUGGYomqA 5aRA== X-Gm-Message-State: AOAM530Gtj7Kr/ls+0beMW3NpUrdX+lxwpdHF15CLlXrH7WGxJDSgFGB /5rTrI2DYESvTn9hhn3E1lPe1YpxMgI= X-Google-Smtp-Source: ABdhPJzYgMNbvvhfGGc0jVDjByVSYpWNSWh7KapfFAMRUva8dMje/6n0t3MSJ7/HEhJnpA2qJqbjow== X-Received: by 2002:a2e:8993:: with SMTP id c19mr5025453lji.264.1600070485478; Mon, 14 Sep 2020 01:01:25 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id k10sm3223297lfb.302.2020.09.14.01.01.24 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:24 -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 4/9] colibri_imx7: wrap video specific funcs with ifdefs Date: Mon, 14 Sep 2020 11:01:07 +0300 Message-Id: <20200914080112.16665-5-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 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 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) \ From patchwork Mon Sep 14 08:01:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363383 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=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=J3044IG7; 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 4Bqf4M2Rnlz9sTS for ; Mon, 14 Sep 2020 18:03:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1795081281; Mon, 14 Sep 2020 10:01: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="J3044IG7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0A4CA82319; Mon, 14 Sep 2020 10:01:36 +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 7F80D82319 for ; Mon, 14 Sep 2020 10:01: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-lj1-x243.google.com with SMTP id s205so17798094lja.7 for ; Mon, 14 Sep 2020 01:01: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=+jgRgbsd0eQr9IIIWpvlrpBXl9E2TspCMOCX+PizxQ8=; b=J3044IG7UZ12PKhGtkWtJ+8+zu9YeD64rPxD80SuVjLZJ+WZc66xx4AVV5HzMWXr/X tVuZ20dj+u6dfROn+ym1iYuFoSRVLSQZFEjvStt54zQQa7zIXkATw44AViqv0167Z842 GCcmWA8m/yCLbVJ4UVcA8Y1Dxwtb5QpU/+rWaLrc5ncM3P+ZpDGinBhUV1FjK/rwTesS YwPa1Cm39jQ8/OtE8iZrEePnJhzk3kidcFMtk+cOYjP7B0AMheemimjur2ef3Ygp8AU5 3UzlX4kcN0YfwVrIuqtqUTfnS+IisJPaTvVqlT4sE9OdhUQAWlfQybq9OQCrriYrRZqU UtUg== 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=Rt6EptIwQKYqTCpa+jfm0VacVg+caedgxrXPIuIbJPGu4895c8DpIOJKpbjC0Uu2pk vjUAtbxUKBI9GnFQY4P71MoJS9OFtAEix4eiTOvdq9PPUNZUZb+rpOxBYkhhYNgIK3+Q zHNgx54+QWv0fmYYmHT4/UsvG9yn7JhYSsE79Qioa2QuKdFhOzQu8LAO5fAU++vwlxop p90rgEhfqa9aHJbxOyoHeFCs759wlL5Nmq0W2tjBI6YjoeBZ52ij8uaRJwaI2KkKaLMV I3JOKuQ5s+qiN7zZTYtqH43ZOjjTq9MqkMN8IHAXlt8VliglAT+YUY5SMksjLr5e37Mw OYDw== X-Gm-Message-State: AOAM5305VAAEFNsZMPtybr0GRHMGxkob8nex7SG2IRqrtmZcXtaEleZh RGMAhvPxBGuVeOKMzW7BI7IqwEnhnEw= X-Google-Smtp-Source: ABdhPJxe4+sz1qMkD0tCLvoZ4ce0frDwNGNlNpIHLeu68wuiAtBCl+dOw1Pqe7Ze93Zh8T9BS89plw== X-Received: by 2002:a2e:b4fc:: with SMTP id s28mr4412841ljm.305.1600070488559; Mon, 14 Sep 2020 01:01:28 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id v13sm3565482lfo.30.2020.09.14.01.01.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:28 -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 6/9] colibri_vf: use preboot for fdtfile evaluation Date: Mon, 14 Sep 2020 11:01:09 +0300 Message-Id: <20200914080112.16665-7-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: 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 08:01:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363381 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=ZgbsSkwT; 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 4Bqf452yScz9sSP for ; Mon, 14 Sep 2020 18:03:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8F468233E; Mon, 14 Sep 2020 10:01: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="ZgbsSkwT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E642882334; Mon, 14 Sep 2020 10:01:34 +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-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) (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 EEF8B8230E for ; Mon, 14 Sep 2020 10:01:30 +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-x141.google.com with SMTP id z17so12345051lfi.12 for ; Mon, 14 Sep 2020 01:01:30 -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=ZgbsSkwT7IKklsjbjysuciQMZ24VHyAGwUPWrm8N88J5c5FX3Dlvp/CuhSYwh+QPaW j3iEYHV8KDsVA5oS8jlEcbd04MLDgukTaPVnuRlY6Q3UKtd5uFztEzYXWGCra0ds4hy3 jSVj6pxIOhbNAeu8ktB3lWb1HEGTQl+NLxN+RZD4SpSG1qNYGYgB3qMUjkRXzbRItwsC pGD+JsdyChvKUOf+23mRlGm0qVveGCU/j1nt/lP3QyGULfNewkmeB2WRxWFTZ7PU6Bcr RWqm82yjUakgBMr8380QPmnLIx2k2mVS5CziJoq5jYbxCc59LbIniCsrQ16Q5DJK07/R zL3Q== 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=fdRxorcZ1Zxu8PSAWR70BGwPfAY9xNucn3KYBB+R1/nDm6C7Cl/84K9L7qEMO3g+jR QqEaSZ4LJxN6wAcIEA0J8ynznlvWf+3ITju2HSm7yfeO7jOV4B8Qw35rNy/+dmMyrwGo 0bNqqnu2Ajcl5UV6bceiprf1ALi7pMyPUoM8X3ewcjKYTa1ObFXf+wNbjfSfbnm182Rq KphsVm9GNghsEWFy0rDeDI3rtrcZreuA2MHKIf0CYMbDnGB2Wb0KlmH3ObS8M4pYAHFJ ZX/Wzn7tLG4bCnfF2ujtx2YOrchZ00OQUiPnB8tQ7z8x08rAZUaZRm/rO3i4UdEl+BLt Lp0Q== X-Gm-Message-State: AOAM532SkIvzepvH5xQY3g41dFPhES8x6oAnI0CZY8NERkfa70gsLm5h 2Ifd2cyi7ta8oNpS5zCgqQCuv1gVzAc= X-Google-Smtp-Source: ABdhPJxRbNZc8cGGWN5cdWjgBSD3higTHXFrnO84nxf6OgiadRA4Qxs61/Ucv/xekK64qZ5ZYuw1/A== X-Received: by 2002:a19:4c87:: with SMTP id z129mr4533163lfa.189.1600070490081; Mon, 14 Sep 2020 01:01:30 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id m2sm3230439lfl.249.2020.09.14.01.01.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:29 -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 7/9] colibri_imx7: use preboot for fdtfile evaluation Date: Mon, 14 Sep 2020 11:01:10 +0300 Message-Id: <20200914080112.16665-8-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: 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 08:01:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363386 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=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=uUtNOVOx; 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 4Bqf4c2tQzz9sSP for ; Mon, 14 Sep 2020 18:03:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0DA568234F; Mon, 14 Sep 2020 10:01:54 +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="uUtNOVOx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 238DB82319; Mon, 14 Sep 2020 10:01: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-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (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 CF7FF82316 for ; Mon, 14 Sep 2020 10:01: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-lj1-x242.google.com with SMTP id w3so17789214ljo.5 for ; Mon, 14 Sep 2020 01:01: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=AW3IliXnNMw5xDBb4W2R1nqoY79sQUzLO/mtxF5Y7lA=; b=uUtNOVOxWPvRDD+1UDAa5iZ1JdEZIIQX+exBRjm2USbABBoIwZY0LhORmUL7HDRHeT U2C7A9JwTzqsZzWUzwWacUZgl+XlJwn092cjni/O63ao/rQlIpPJ2d6xvv3Z6RpckiNs +0wwmHbzTpGyCiliDcOJ/0JY8GKThqphBoGAb5gQ0jjfg4/EIuvKgKHx3d2uunGvOoqI K8hNa1NpclmKpMFm/vfbxxIkuYT0xEp4rk/DUCckgHY3kB/SGKdhASlG4m3PixX3yyeX rTSHZ+wYiZQhU4pPaY3Uqe/fqIw9WmOUYkQR3SBP0DfJ72ycdd9NBtKh0CZ0WbBxXzbN jIRQ== 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=s9v1J58jC+96MNAn/3rUt783ZHmZrmQWnjWY5/DM7Lnwg1gfnePB46W2lAGCPCHMve ELGbR3Q2ykujSC7e5wUXuiBZg0iHRWaLi1d/wXGrk8LrRvQ2W/dWryzB9s6tOtNk2JUl c/gQwtLAWSXVXvH3LL+MpAG0a63jXOYKfkX/eDHDttg7fsn+45ckiD8RD8BxaC1nQJIp sSbJaa/qO/ImrXh1qR/f1E0Z2OF9VQasjW2o9OphF0f9mQOH9xW3wZNKnrtRNhVRoSoO cBxHnYEXlwHnUaXuXjmqUSTS6ztpxtmjTM1lAyw14IlNzkbZIJ2gMLSPSsDBe5Fl0kFW utAQ== X-Gm-Message-State: AOAM532rcLHyxcT8dorNrjDWHeidNHu17Vszkrb+bIeD4to3o0pz0Uh/ tQR87qX2pURj4h8aghteoBZejbkJBkI= X-Google-Smtp-Source: ABdhPJzluO1eQhFQSRtwKYp3X1wxOxbMCbAa7DuoNKxr1qZm35/zrFQ0ja8eGcSeigiemlBfj27Blw== X-Received: by 2002:a2e:964b:: with SMTP id z11mr5161219ljh.364.1600070491686; Mon, 14 Sep 2020 01:01:31 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id b14sm3156280lfo.257.2020.09.14.01.01.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:31 -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 8/9] colibri_imx6: provide fdtfile in env instead of setting it in runtime Date: Mon, 14 Sep 2020 11:01:11 +0300 Message-Id: <20200914080112.16665-9-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 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 08:01:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1363390 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=iaz8tJve; 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 4Bqf4r0VSDz9sTM for ; Mon, 14 Sep 2020 18:03:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F1B88235A; Mon, 14 Sep 2020 10:01:55 +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="iaz8tJve"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0FA2082317; Mon, 14 Sep 2020 10:01:39 +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 02ABB82334 for ; Mon, 14 Sep 2020 10:01:35 +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 s205so17798289lja.7 for ; Mon, 14 Sep 2020 01:01:35 -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=iaz8tJveYfTUzbRapvN0ibiyDW6SipX7M4zyMq0wAvBzkmSQyKwW/y4vXkZH/QPfMj PzU82vzqFXGEhKdZ683eA7waSdL+dowOX/isEt0xMXQKZ3/d5FxJSNd7lXZvdo+eLDP5 kiAKRfa3MilbiNCVD5itjfo/33CmQIPH0XDAGexQ+Fh16m2WvamupRB97mOGuZrzlkx0 WV557G+wvSPku6nyuEkfjXLiAo0smR2PeLmkT68kRp0/aSnvIg1GODag7IqkDJ91z4oe FzjHoNhNeADpw80ON1kXOROUNQnHbmlGSmaZ2iZOniEy7G77qJgWv7ut6prooQkKD05m 2ZoQ== 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=UuuwB55Dm+eqrRaVHg17o+IQ+RJqNWTpuqHiVN+ppHN8x4gV+2F0gD1Y1gK/MD9Gy1 LPbCHCV7KelTbzy2TioGDRM6Kob4liFTu20EeGVBUtqfa/UbvrVXsFP8TF9Axs/ZBDKL AZaLakWvQ8dV/X4HRcR3J/onay9/G8fSZZ/cCHeW97kUm0oDDD7Cxffy8h3bolI5JNTs R0Mv785vHFx+cVnZUPSA7pzIl7eWYIyz8/E2bRMj+kdoBBo0PKZJ3ix1O4lPnyqTrSZ4 EIF2aT2dakwq8XDJj3Mrfq8PjVyHVpt86N1wWZimkjR5HHxzs2oEXOL9rCot4soIMPBd iZMw== X-Gm-Message-State: AOAM533gyBB3CD0CZBTFZ5YzLk2+ULk/xgxNVpkTKvlcx0ZR+ZS/ozL4 lvMOjQEYVqwh7o6W+hxTbVx+k1Jqqo0= X-Google-Smtp-Source: ABdhPJxvo10tu4/MDjQeo2NqpwG23Ov+P83S/o7nTXBQPoatzmc5x6q7UQ+ueC2durvuiLz9MgoNkA== X-Received: by 2002:a2e:3008:: with SMTP id w8mr5134081ljw.63.1600070493156; Mon, 14 Sep 2020 01:01:33 -0700 (PDT) Received: from localhost ([194.44.101.144]) by smtp.gmail.com with ESMTPSA id w26sm3925324ljm.30.2020.09.14.01.01.32 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 01:01:32 -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 9/9] apalis_imx6: provide fdtfile in env instead of setting it in runtime Date: Mon, 14 Sep 2020 11:01:12 +0300 Message-Id: <20200914080112.16665-10-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 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 \