From patchwork Fri Mar 3 13:26:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751468 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=bug7IiJB; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpkQ202Jz2467 for ; Sat, 4 Mar 2023 00:30:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8F7685D6B; Fri, 3 Mar 2023 14:29:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bug7IiJB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3816085D7B; Fri, 3 Mar 2023 14:27:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 5F15085D63 for ; Fri, 3 Mar 2023 14:27:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x534.google.com with SMTP id ay14so6597448edb.11 for ; Fri, 03 Mar 2023 05:27:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8AET/0MQT6ozvyLyqG5D8gyAtDAnlyAT7ZUKKtQIwKc=; b=bug7IiJBLFZ7WAjcmV5959cCNU4ZpLpNzTH32dPV53erJMcZnyrh/+FnoUt7uoxuND xr27xlzVznoMbFZOEbwnxSZrwsk8SKpc04c9grweG0JcHO3S/TE++JC9qpp2fKEnu5/S U+PW3yIgvTK1qJSTqT9SJdEGjko0ImILOzNa9fQnQn8AfezcUvXjhNAnxHTIAJ7npatu nHMQywK9stggVARg2yqs225l0IMILrcjzFJLSwREFCG7QFX30NQ+IhuNE+93zNDHcwAE VaEifxSjVlYq8kjP5M8Yt7LiO+zqw4Ljiqj0rV8VV9zTjNYy/9AbeBx7pBv+qpMdMRHt +EEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8AET/0MQT6ozvyLyqG5D8gyAtDAnlyAT7ZUKKtQIwKc=; b=JDXHVfL0+OILxVP0J4aQrklIaVFVX/26+u9Fee8bVK1gvjxafNKpUeJWFiIy95Qnyr 3V8QFSwQ13rd5kpHq3xJ3bNGvxnTwvbE9SAJ+kgC5bKVaS7uuiRNinIHLf9H4Y4QJ39V nnSjq6a5y4dBCnewUZlLW6Qc8eH4+u4tQ4vf0Y/KFukQHAlQaR5a/ljuBjC8I9IHTEqX PUpgBBjG++d6NLX5FhubJl5VF4DkUrLyJraXA6Q3umX7dh0NfZfFNMCee4IhXHIlkjMZ ijgBegYzwRUAIDzImOghI+hl8wKqhr5re9UlajI8vjkIl8miwFzZXmxang8mgQZthKBR TMLQ== X-Gm-Message-State: AO0yUKXXBjGveEs8KW/H9rCv8GfuwDtGmM865p+88ptb/Vb2m0rvdmEH pYiMJDCvPFcL5TUeeRvsJ6U= X-Google-Smtp-Source: AK7set8EqG1ZtUn3RgtcO/xvnJAViXEvYk3+cuZIuCE67cL6/QauCN9Ko9AsK/c2vPMZ6Ke6WHuqDw== X-Received: by 2002:a17:907:a602:b0:8b1:76ca:f228 with SMTP id vt2-20020a170907a60200b008b176caf228mr1460542ejc.39.1677850021901; Fri, 03 Mar 2023 05:27:01 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:01 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 01/17] board: colibri-imx8x: add 2nd ethernet address Date: Fri, 3 Mar 2023 14:26:26 +0100 Message-Id: <20230303132642.15574-2-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean All Colibri iMX8X variants have 2nd RGMII on SoC, so add the address for 2nd ethernet. Signed-off-by: Andrejs Cainikovs --- board/toradex/colibri-imx8x/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/toradex/colibri-imx8x/Kconfig b/board/toradex/colibri-imx8x/Kconfig index b89840a379c..cb11e2c318f 100644 --- a/board/toradex/colibri-imx8x/Kconfig +++ b/board/toradex/colibri-imx8x/Kconfig @@ -12,6 +12,9 @@ config SYS_CONFIG_NAME config TDX_CFG_BLOCK default y +config TDX_CFG_BLOCK_2ND_ETHADDR + default y + config TDX_HAVE_MMC default y From patchwork Fri Mar 3 13:26:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751469 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LMoLM/kg; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpkk2kfDz2467 for ; Sat, 4 Mar 2023 00:30:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B897A85D70; Fri, 3 Mar 2023 14:29:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LMoLM/kg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AD35F85D80; Fri, 3 Mar 2023 14:27:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (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 24A7985D69 for ; Fri, 3 Mar 2023 14:27:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x52b.google.com with SMTP id o12so10215056edb.9 for ; Fri, 03 Mar 2023 05:27:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IzZX1QPYKXAxBwoMJFW1qMBXwifLF6SGgzQC1Bw17a0=; b=LMoLM/kgoBCX5Pz5cP6jzF1Y7ZQcS46B6eFEHaAGOUQvIuwH1EBT5kO9fikxZeDgHz Vfdb9l8PPc16VR1mSEvqxulovHZC4mJTYt7XpgtZroJB4Oy3CoN92+6AZRqyJ1n8HxkA i+VT+PjFh8oBi3gALZNfZjKdRG9e4zQBj42sZojxOaU3yhCcQoyYTff1SC2KVaXAtqBD tK1MgS9STJ+trUkMEFE0LunzcwTi8KofIxCuNcchIlwB4MvZnHS4kKH3BZjBx5hD7Cjg x+3mZwvcFl+wdrHDmgHV2LoWKwnNk7iR4GnPub0c0VlvSv00oO8U+BupJNpfXRq3/9GB mQ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IzZX1QPYKXAxBwoMJFW1qMBXwifLF6SGgzQC1Bw17a0=; b=E9w79cDkyR55qW5pWiYfgk/6IflMg3uRuLnRw3CKRG7rusCbuFm5iT2OJsW1Lh3mjh jKGxqW5bqfc68Yj2VLIw7EMvBiZdocoO8SMkFoiyUjW16jyRGiDvMKqTquQmi09fxFT+ hQXC2yPUSCPEwc3ZV1Um2TNbrk9uf/aAa2Tokql+vRwEj8bXS5rJi/kIYMFfe8RXqATt f8bXnmT3IsXzVQtWRSGW6r918yzofRf44wfajlMmnCHpXxmRUZQNWIEnet7AkOoDc8y0 6gSBtcrnUwpp2ZsUovjLGWg/wC68grsrZB3/gt2j9RN4MYG/sG2Exao3a615We1CwwbP UzpQ== X-Gm-Message-State: AO0yUKXTjpKLtlBkm3tTvpuAYIqkbftYGW5Vz+2OHzAjx+GPXlncW66q c0EMWKNB3146xWS07a5a3GWc2MyJPZp3Gg== X-Google-Smtp-Source: AK7set+3OWzeHaYKWKh+5Q+0oHTAbZOm2LlOw+wj5yZsW3hnlzO7pgkVT89fU0ZHNHe2piwgwHdgvQ== X-Received: by 2002:a17:906:3503:b0:8af:40b0:3dd1 with SMTP id r3-20020a170906350300b008af40b03dd1mr1697460eja.27.1677850022737; Fri, 03 Mar 2023 05:27:02 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:02 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Philippe Schenker , Andrejs Cainikovs Subject: [PATCH v1 02/17] colibri-imx8x: Remove baudrate from console argument Date: Fri, 3 Mar 2023 14:26:27 +0100 Message-Id: <20230303132642.15574-3-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Philippe Schenker This commit does remove the options argument from the console kernel-argument as it prevents the serial driver from outputting anything. Do this by switchting to use the variable "setup" as it is done on other Toradex modules. Signed-off-by: Philippe Schenker Signed-off-by: Andrejs Cainikovs --- include/configs/colibri-imx8x.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 3ec36aa773e..b337ef28533 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -64,7 +64,7 @@ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ "boot_script_dhcp=boot.scr\0" \ - "consoleargs=console=ttyLP3,${baudrate} earlycon\0" \ + "console=ttyLP3\0" \ "fdt_addr=0x83000000\0" \ "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ @@ -77,6 +77,8 @@ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ "panel=NULL\0" \ + "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ + "consoleblank=0 earlycon\0" \ "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \ From patchwork Fri Mar 3 13:26:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751467 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QBUtSvKa; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpk6134cz246T for ; Sat, 4 Mar 2023 00:30:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7246285D64; Fri, 3 Mar 2023 14:29:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QBUtSvKa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E46E85D63; Fri, 3 Mar 2023 14:27:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 3C9A085D6D for ; Fri, 3 Mar 2023 14:27:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x534.google.com with SMTP id d30so10336053eda.4 for ; Fri, 03 Mar 2023 05:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HGXyaWDTtoomPX3yuqc+GcgAknie6nEvZv1JnQ3MF78=; b=QBUtSvKagxYNO/5bBIt73moQhNO8yZWqCQigf4C1upzwgZuJCB3JF6TRDnfGHuC9Oj O0CYsNO4W4ZR74jIPcaysJnodLJtOezIt9Tt+oTM4tcEiyGyMWCqUVgduGCmPyFbP8rA smYPXSkBwwC9p9FIdmCYtVMc3v1bN0uyg7TmQlPgS+kJAfLY4HPIlzb/qwX5iXnGLy79 XWSfudlelrzepjvhytPshU5L/2hz9Dg/ITIO9kXCwclVmPGmfEt2F5yCOp8Y00EG0can vBGSAfmsktxg1qfh2Ccs3M1oKmOjiWGVCs9G2DBxIMA/afd0iopwl3pFZ62ZzqO7sFcL kZqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HGXyaWDTtoomPX3yuqc+GcgAknie6nEvZv1JnQ3MF78=; b=5+mnCpXTrsCwo5M9nSeq+n20E+keSGay3ICihgiqnKQWu5+8besIyPgkE6UkvwqkhF xW3UEiuXG+xvHvuIuGwglsDEqk3ZhOJZq7I/XFwVYuVR0xti3aXQSLlhdC5s4FSWIESf IwPQ2inawUOGp8Ah9TORF1ittdE3G/Lzs6Rb/i3pPnYbTfQC6rClO0I4o3r+hmY+r3yy yIuKrNe0cyUWA8JLErQiGYD3lXbTpvy35Rvyd9RssqlTcd01b5wzwd9PPojYMUNiiSI9 HG7IqQ9GlWyrUR3lvzA5wO4gTkpgfbwRqhxj8pKs5w2CEQOXPzuKfuKKBIXenIS9Pc7D THDw== X-Gm-Message-State: AO0yUKVVT7kr8N/LtkIeBU7VyKagkMxFK5RstyKTPiYvPHwC+yiqxVQw ewM8dHSUAUM8PQ16u84Etkg= X-Google-Smtp-Source: AK7set8sNoyXArfZzwGq4PIETwO7N4+VTSf99xmJjW/kdZ7b0Ksl1Yh9IsrLM5OqLDlHCyahQ0dUaA== X-Received: by 2002:a17:906:d150:b0:88d:3c85:4ccf with SMTP id br16-20020a170906d15000b0088d3c854ccfmr1579093ejb.25.1677850023647; Fri, 03 Mar 2023 05:27:03 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:03 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Philippe Schenker , Andrejs Cainikovs Subject: [PATCH v1 03/17] defconfig: colibri-imx8x: enable CONFIG_OF_SYSTEM_SETUP Date: Fri, 3 Mar 2023 14:26:28 +0100 Message-Id: <20230303132642.15574-4-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Philippe Schenker Enable a call to ft_system_setup() which reserves M4 memory region. Signed-off-by: Philippe Schenker Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 83f39996b1a..6a5c6e1d61b 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -19,6 +19,7 @@ CONFIG_REMAKE_ELF=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y +CONFIG_OF_SYSTEM_SETUP=y CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y From patchwork Fri Mar 3 13:26:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751471 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WINhjMvw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSplH0QzGz1yWy for ; Sat, 4 Mar 2023 00:31:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DDE1385D80; Fri, 3 Mar 2023 14:29:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WINhjMvw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B6FE85D70; Fri, 3 Mar 2023 14:27:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 10F5F85D42 for ; Fri, 3 Mar 2023 14:27:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x536.google.com with SMTP id o15so10119572edr.13 for ; Fri, 03 Mar 2023 05:27:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NRL/tHDX9JoMqFvhyUSU8w1KLQH/pjc5kbC9vhXljDM=; b=WINhjMvwKYbpKSqRIs8rSt9SowXHpY1yG7AyCz8Bv3bxQYi3PTVCusPnFLq39mIVf/ kOLs1mF6obJvitvixfl3LOoTIgzyVRrMdGf23tPAOzW0deryaj3KAtMMMJd9hZI0Cp10 okDx8JqMqr3MkK9QFh9UMxAKIslBM7N93qbavnwmd9fLo+fGurHRt0U4RBIPxLXKt+d7 rBAV99mQMP/d8QLAT4MK6eM6hyC8obw6TBfPSE4VFmuSolIJEhx1DVFq7YE40/cYzkBx 8tAXo4Izk9hxbbOkiMpEvLUMPY7k2q1CxSxDNJhvigfqLE8CC/3D1SE3wFmV1q6PYA6L 8Evw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NRL/tHDX9JoMqFvhyUSU8w1KLQH/pjc5kbC9vhXljDM=; b=4chVqo5/7C+virxz7aSqc8F2/CwF9C5AaWU5OZ70OcW7EYdF9mSswJAA43IxT/UwQ3 7x51iIvXFCfxrraC+eXZJoY86JU7oVQz5kdxTAaNPtNeyqdJW6tRfu67qmHOJ+tyk2jr R5lhjvLPZjvIYwDZNcKVUsc4F0nzKw69lL32g7gosbqW5stCEUsolQSP9wrdNPS96BpK w0t3lnGH5WZLJRbBJ28fDt4C8x3Ogjo2sb/+ATNgHXhp60xl7wuuTxhg6ixqzam/gyf6 KB0m/pGzbLhr4uNck+Y2d11nyIOwlSO37TWIm/2x1s+73ILvzSunRU1WL7yUrZXuLhya n0DA== X-Gm-Message-State: AO0yUKU7KukXCL4XgI04ZywCyuFiRkZbBqJ70uWbgx97P16/lR6smvk+ quMFOo3tmnVC0zy1YH6F9mnbRX/V3+4KXQ== X-Google-Smtp-Source: AK7set9acODM1UJ6sz9i0FZlW3c9PQOrX0iuO279EXH2HvdrvZQsif7Hshy//ZmM6yqcSopNyKLDCg== X-Received: by 2002:a17:906:d8c1:b0:880:3129:d84a with SMTP id re1-20020a170906d8c100b008803129d84amr1476806ejb.60.1677850024531; Fri, 03 Mar 2023 05:27:04 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:04 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 04/17] colibri-imx8x: remove obsolete net usb start Date: Fri, 3 Mar 2023 14:26:29 +0100 Message-Id: <20230303132642.15574-5-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Remove obsolete net USB start. While at it also add a comment about enabling distro-boot. Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- include/configs/colibri-imx8x.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index b337ef28533..c530cd7db9a 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -35,13 +35,12 @@ #define MFG_NAND_PARTITION "" +/* Enable Distro Boot */ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(DHCP, dhcp, na) #include -#undef BOOTENV_RUN_NET_USB_START -#define BOOTENV_RUN_NET_USB_START "" #define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs ${consoleargs} " \ From patchwork Fri Mar 3 13:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751470 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=o/HBeiSo; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpl03036z1yWy for ; Sat, 4 Mar 2023 00:30:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0065785D74; Fri, 3 Mar 2023 14:29:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="o/HBeiSo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80D2485D5F; Fri, 3 Mar 2023 14:27:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 9EF4D85D71 for ; Fri, 3 Mar 2023 14:27:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x534.google.com with SMTP id ay14so6598177edb.11 for ; Fri, 03 Mar 2023 05:27:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6KKdV6nfbVtXdIsZOmgObRlZwyFG+HuTJkpEf1GHkdc=; b=o/HBeiSooBkXtYFdlXfBfB8iNXXaXdi4ixLV7f5WtWMr25Wf/2aSlW9NnltxlPa7y/ QuHrRiaZJ9Chkasi5awEoChSzTTwnHRbkS9GEM524d63I/ydVPx6wqy9Pmf8EJFdksj6 ZYMOa/TT9et7xJQhJn4MIeg3NBbKf0IAwXiyj0gHytxAeumHTVfd+xSw8/Um9rENDUsu 4rpTrgsqI6uKkkTtH71cyK8lnwZe/GnqiKGcs/iltjJ8juwJ8ht8EyKi6mQltIVnAITO D/EneC18Emf7ALMXF2MZ5uPN2fK/G1SkCr60Cr9wC3C7Xp8RWxc/uceHW7TUT4ttw4Hk k95w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6KKdV6nfbVtXdIsZOmgObRlZwyFG+HuTJkpEf1GHkdc=; b=R5U4W0plm/lPXtessdi7Q4MIUYoX3Y7WHbVarT8MSBzwdF7Lq91b3FyqDvPD6pUybN oVsjZ7NcdxA0Fy0Xb6aNsp1MeUMV6bkekUGmLC96PSLStMyhKTpmg46nNaBEusWrsx38 4zoxABkpvb7Oy3NNOFFwfyRf+nbxNf3KErt7Z/HpzjDnxsaugBTZzy0SAL2QzMFHVC43 Z4hOG7pWQSprDCeRf38xITXB4xRxvKBx0KjI/NL8KSAY0cC7OPsmvZXxHYDiwRmMEozh hfG2B/xUMJsuLV5G7uqtpo42tU0eB2R7NJZJHFE1B5xVO4l+OuYwUyPpJasoVFYiabn8 jjng== X-Gm-Message-State: AO0yUKW4bmZZuYevCgsOhnU4bjuPzfc3TSfl47RgCnVkysJtwq9cYDa1 ZMlxUKtg1tcdBEmM3SRV7Bc= X-Google-Smtp-Source: AK7set/A4tqxFZ5UEfFEhdGoeUHIORlLM2rTs7S8gkzsAzPCvRadL9JcMgP/biEM/v09g/QfefoRCg== X-Received: by 2002:a17:907:b15:b0:872:27cb:9436 with SMTP id h21-20020a1709070b1500b0087227cb9436mr1457147ejl.43.1677850025425; Fri, 03 Mar 2023 05:27:05 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:04 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 05/17] colibri-imx8x: remove obsolete sdhc related config defines Date: Fri, 3 Mar 2023 14:26:30 +0100 Message-Id: <20230303132642.15574-6-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Remove obsolete SDHC related config defines. Nowadays, all SDHC related hardware configuration comes from the device tree. Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- include/configs/colibri-imx8x.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index c530cd7db9a..f493ba9b0f8 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -10,10 +10,6 @@ #include #include -#define CFG_SYS_FSL_ESDHC_ADDR 0 -#define USDHC1_BASE_ADDR 0x5b010000 -#define USDHC2_BASE_ADDR 0x5b020000 - #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x83000000\0" \ "kernel_addr_r=0x81000000\0" \ @@ -85,13 +81,6 @@ "${blkcnt}; fi\0" \ "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" -/* Link Definitions */ - -/* Environment in eMMC, before config block at the end of 1st "boot sector" */ - -/* On Colibri iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */ -#define CFG_SYS_FSL_USDHC_NUM 2 - #define CFG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 From patchwork Fri Mar 3 13:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751472 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=d1/9s+Jp; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSplX2NL8z1yWy for ; Sat, 4 Mar 2023 00:31:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E57A85D77; Fri, 3 Mar 2023 14:29:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="d1/9s+Jp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7976985D92; Fri, 3 Mar 2023 14:27:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (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 7323885D75 for ; Fri, 3 Mar 2023 14:27:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x52b.google.com with SMTP id o12so10215784edb.9 for ; Fri, 03 Mar 2023 05:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=coqSAkAeHrwrecu6Upr6e7ZYPLt4KB8BPuACjUzl5Fo=; b=d1/9s+JpSKclXI1XbIGi4Kc56Ys13rX3HhJySLSboKz2c5gl7TJzinqTw6E7UZjjJ6 tzbxqPFXcXI6//hCGNNchX/BbmbVr3ssDOufv/vOype+SLVUmsB/XcjgOPl6VvTSfUtO CnEK5l4JlhPqn8Vh0LV3X3NkAq/c4U1RFS5e7IVXYeF/mTrKfVwq6Kugsea33RoWfzvJ QWVPSW0iRi6cuxplECbYwxy+aWuyirHRk8ywhtlUqQzJdnQOhm+n1qPL9PlNDoIUvc/L SAUTa5scPxqrggeRITdwPzL18ncJB+nI/cEkn9LPyzkjnUsv753sCuqQ6Fnhmwyb1W09 b88g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=coqSAkAeHrwrecu6Upr6e7ZYPLt4KB8BPuACjUzl5Fo=; b=L1HJwCL7S1m5JFvB6u5Z7DIKuNQm3bq+UplZlWooECsJXMurdR3M5Igi3c3zbNccpy XYh7sL+PrhTD2y55cfJxNLGj3GofvhsfRlAbetXWQ2o34ivA8jIeKCwGrFdloKfqHZUc 0lbWpwE5b0dc5L7/lWMsdH1D3Scc6Nb42T7YMy0cdNedA+KCzgLWIBujDKeBfip8PEqc e9iOYQFFnV8i+S47Gi4YXN8kRNOyD03Z4CLJKIn4PW4KWkElaeX5ch4WdMUTc/wItH0y kvld4XprPQ2jt3IJN9ht1/Kqgk5l9ZuNEfP4WOro8xhnPd8yPXmtped2AJlkW4jZVbvP Ryng== X-Gm-Message-State: AO0yUKVi8qo3hNRRx6ppAy3QGt+hi6ntnIcKDVvafAY9N901GZaUZxFQ 17iS2bKq0rYhTw3NZAyUajc= X-Google-Smtp-Source: AK7set/RasInaKymsvzFjeHIce43hA3QKUYMTWHJdLsZ7uJrfPX/DQQZrN2KoOXlzRs4cmVgfIaR5Q== X-Received: by 2002:a17:907:9494:b0:8ec:4371:19c2 with SMTP id dm20-20020a170907949400b008ec437119c2mr2039610ejc.73.1677850026282; Fri, 03 Mar 2023 05:27:06 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:05 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 06/17] colibri-imx8x: update update_uboot confirmation message Date: Fri, 3 Mar 2023 14:26:31 +0100 Message-Id: <20230303132642.15574-7-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Update update_uboot confirmation message. Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- include/configs/colibri-imx8x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index f493ba9b0f8..7826596a331 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -74,7 +74,7 @@ "panel=NULL\0" \ "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ "consoleblank=0 earlycon\0" \ - "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \ + "update_uboot=askenv confirm Did you load flash.bin resp. u-boot-dtb.imx (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \ "${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \ From patchwork Fri Mar 3 13:26:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751473 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=iyX8riNI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpln67xGz1yWy for ; Sat, 4 Mar 2023 00:31:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDE6785D96; Fri, 3 Mar 2023 14:30:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iyX8riNI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84CED85D68; Fri, 3 Mar 2023 14:27:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 DB6D385D66 for ; Fri, 3 Mar 2023 14:27:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x52a.google.com with SMTP id a25so10532208edb.0 for ; Fri, 03 Mar 2023 05:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=urAHSo5gXC69rI6/8zyJUOCgyUDKvTmecwKE/ILam6w=; b=iyX8riNI5C8Sqbhd8fRZLFt9V7kTICwe4PPcp8Vz2GW/O6D0/rz/dXnnJFh5AR7QSh u82PMKVUZp4J6nHnoNKzFxqfVZWiEATaCyNTxc8N6tn1d+WyphqHzMVFONZcH6a92kF1 lbTE0VfT11j8FyzUDK6OfwjlyZrIcBBeX1vvgosXBQG3ectz7XntMmU9Eksc+DQuYGm8 bJLVQP8JURM+NGA4HBQGhu7mgz0EZCtI75AOaNAPq+6BjK3E+1t3WZOzGcXYQWAdIJHm UKhb7He2khr1qzn4TO9u9IecbhFVKXhtp4biP8fp7kSnNje3Oc3tvhoPslfihpIerlX1 YG2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=urAHSo5gXC69rI6/8zyJUOCgyUDKvTmecwKE/ILam6w=; b=R7oBAqmlli20yRdzfkTcHTyZw+OtyVbsDDJjgXx1A8+fy3BBq/kRjZ9sTjUfNbycRx TbPWjldGu9efe86IlNQ33WBP6yWdhcPge8wZOnYhOy2TiHRELak1QpkGHjAXa6nYb4G+ 1eBg1HjoJWjFc1GrtsXcaPhFkSEhc0ial6XYEZPPUSTmMAnprhuk3XqYkgj6crPF0m2Z 6nGQauOgmZExLp6hAwpYphCrDq/1XIxEOLCOIfgbivg3nZYvtgz7e9YUtIv4qZkBAF4f Fu80JJ68mpMD2MEDH79O1beAxUY08kPbLhUfD4VQ0ILvgtAfDP7/tkqwyjaIa0Bv7i7s wj3Q== X-Gm-Message-State: AO0yUKW+a0pQtb37H261UU7Pf5cLWGbvu5blwHGHGI/nX5VHL/9y7ip+ +L4MIQ7klqzorPr+UnBIpPY= X-Google-Smtp-Source: AK7set/5X4XQcs+BjlgoiGRiDh0VslikOiorGNlGpsrJBuXeVfEqwbxo262Bil7li6CgAxyqthCmOg== X-Received: by 2002:a17:906:6dd8:b0:87f:546d:7cb5 with SMTP id j24-20020a1709066dd800b0087f546d7cb5mr1630589ejt.37.1677850027237; Fri, 03 Mar 2023 05:27:07 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:06 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Max Krummenacher , Andrejs Cainikovs Subject: [PATCH v1 07/17] colibri-imx8x: extract is_imx8dx() from ram detection Date: Fri, 3 Mar 2023 14:26:32 +0100 Message-Id: <20230303132642.15574-8-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Max Krummenacher Refactor the detection of QXP vs. DX SoC into its own helper function. Signed-off-by: Max Krummenacher Signed-off-by: Andrejs Cainikovs --- board/toradex/colibri-imx8x/colibri-imx8x.c | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 169d4d04b16..88eddbddaef 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -40,21 +40,25 @@ static void setup_iomux_uart(void) imx8_iomux_setup_multiple_pads(uart3_pads, ARRAY_SIZE(uart3_pads)); } -void board_mem_get_layout(u64 *phys_sdram_1_start, - u64 *phys_sdram_1_size, - u64 *phys_sdram_2_start, - u64 *phys_sdram_2_size) +static int is_imx8dx(void) { - u32 is_dualx = 0, val = 0; - sc_err_t scierr = sc_misc_otp_fuse_read(-1, 6, &val); + u32 val = 0; + sc_err_t sc_err = sc_misc_otp_fuse_read(-1, 6, &val); - if (scierr == SC_ERR_NONE) { + if (sc_err == SC_ERR_NONE) { /* DX has two A35 cores disabled */ - is_dualx = (val & 0xf) != 0x0; + return (val & 0xf) != 0x0; } + return false; +} +void board_mem_get_layout(u64 *phys_sdram_1_start, + u64 *phys_sdram_1_size, + u64 *phys_sdram_2_start, + u64 *phys_sdram_2_size) +{ *phys_sdram_1_start = PHYS_SDRAM_1; - if (is_dualx) + if (is_imx8dx()) /* Our DX based SKUs only have 1 GB RAM */ *phys_sdram_1_size = SZ_1G; else From patchwork Fri Mar 3 13:26:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751474 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=UB9fJWe7; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpm3129xz1yWy for ; Sat, 4 Mar 2023 00:31:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3007C85D88; Fri, 3 Mar 2023 14:30:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UB9fJWe7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A40B685D7C; Fri, 3 Mar 2023 14:27:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AACE285D6C for ; Fri, 3 Mar 2023 14:27:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x530.google.com with SMTP id f13so10283147edz.6 for ; Fri, 03 Mar 2023 05:27:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UReZJcr0aMPEfSRwrD0z87+erWUlhU67AvK/pSpR9Tc=; b=UB9fJWe7oNPVKahh6AoYhCwh9EGmeBV3ImGlX/Gozv4P9dvFY04dzpQCwLT0qMN4x7 q9lAL/5xFkewYqKhRSM1j03CQGMfck9uhejOsIW0cJvwr/+k7mcmXzP1DVHSEB6q/cBf MSpT4WB53h9RMW0TeaH0LIsWnlMbg/aZl9pT1BRLHE+2tbqAUU+7iwRLRD6xKyMbeSkJ YXyyd/Bb4YGHDYDv6rVRaHeBgNvVOPVYuRCUmjurZStKn1iTI3M/qNm4njua501pK+Za km0ck5UGRPzKM8zjaHJUgBDNVRpu7Ks9TVX+4RuRdXDpgOJkZbq9MHRrXNq6W/+h/BOL lEjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UReZJcr0aMPEfSRwrD0z87+erWUlhU67AvK/pSpR9Tc=; b=JfX5ul57d6jP7aHXp/WeIglMoj3bAwfLE6mR7L+wFVWULrXKW2bOMfeteJJ56G7TlS 2/RWV828CYFCNBO+aBz4EhGrUwf6qwWTyYBB2sJ4BbZP2y4FLCOGIqvcAyhd/9omdEQF DWJAnTuYqQcIFNene3cWILFilc5IA7okcWQgWjTB7RqSXN4DCeHgYySuwQQhIge8gVRc H5HkRnII1+WJk9yPLQoTR9w8+rnPtOCarsvjKGy2oL0yL+x24sUQeqVWPyXSgUJ2NejC Q+2rkwAp9cl0XkZRm8AmCv3u0uAwmzkBl4PA5Pw3achAgfPdCcmHGmQ3eAjA1Y3B8lcQ dTWQ== X-Gm-Message-State: AO0yUKXGEC4HRYmnrf7BkMVX+mxJiS4mbgVKTDwp9BZkTKEXMUblVAHC +RyDBwauETuzHVSMPbFmnv4= X-Google-Smtp-Source: AK7set/uqDJd+1+80FCKz7hA6AlA8C72FwLsMW0QgKtBb6SopC4IJ3JNlW/6WNjSez75BvcPk7ykwg== X-Received: by 2002:a17:906:2da2:b0:889:7781:f62e with SMTP id g2-20020a1709062da200b008897781f62emr1571448eji.22.1677850028209; Fri, 03 Mar 2023 05:27:08 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:07 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 08/17] colibri-imx8x: construct fdtfile dynamically Date: Fri, 3 Mar 2023 14:26:33 +0100 Message-Id: <20230303132642.15574-9-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The following expression is used to construct the device tree name: fdtfile=${soc}-colibri-${fdt_board}.dtb - soc is set dynamically (either imx8qxp or imx8dx) - fdt_board can be modified by the user (eval-v3, aster, iris/iris-v2) Signed-off-by: Andrejs Cainikovs --- board/toradex/colibri-imx8x/colibri-imx8x.c | 14 ++++++++++++++ configs/colibri-imx8x_defconfig | 2 ++ include/configs/colibri-imx8x.h | 3 +-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 88eddbddaef..6ed9cc4fa80 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -123,6 +123,18 @@ int checkboard(void) return 0; } +static void select_dt_from_module_version(void) +{ + /* + * The dtb filename is constructed from ${soc}-colibri-${fdt_board}.dtb. + * Set soc depending on the used SoC. + */ + if (is_imx8dx()) + env_set("soc", "imx8dx"); + else + env_set("soc", "imx8qxp"); +} + int board_init(void) { board_gpio_init(); @@ -158,5 +170,7 @@ int board_late_init(void) env_set("board_rev", "v1.0"); #endif + select_dt_from_module_version(); + return 0; } diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 6a5c6e1d61b..6c1c9978d11 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -20,6 +20,8 @@ CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb" CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 7826596a331..9a4a5f3b5de 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -61,8 +61,7 @@ "boot_script_dhcp=boot.scr\0" \ "console=ttyLP3\0" \ "fdt_addr=0x83000000\0" \ - "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ - "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ + "fdt_board=eval-v3\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ "image=Image\0" \ "initrd_addr=0x83800000\0" \ From patchwork Fri Mar 3 13:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751475 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=TTb+f1Pg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpmH4MRjz1yWy for ; Sat, 4 Mar 2023 00:31:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4825885D87; Fri, 3 Mar 2023 14:30:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TTb+f1Pg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8067B85D74; Fri, 3 Mar 2023 14:27:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (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 8982C85D6B for ; Fri, 3 Mar 2023 14:27:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x531.google.com with SMTP id x3so10163869edb.10 for ; Fri, 03 Mar 2023 05:27:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hMu++LfAmmKpUItr5XJfMXYQtWPwGiIMTXSRYonRvk0=; b=TTb+f1PgGquMn6GnzbZLKmwzgqZ0R/ifWQXZGNDIe/D+hMncsraW3dHaYfW69cCdv9 BpUoW/GrsdDggyGmdAyGU5c51CJoTyMrBfzodmsu2agVY78/ZeUqoBGRlNMSe8Gj9udK /PYzAd+i07Ya39Qx7MjRFeag1meQTFu1g0Kl7cxTIts0nCC0cjuD9r/jEC5C5Adl80wm EMIsaJAeU0C6kxtl73nuE0sOFXJ63zjTLkpr2ksVqAqZCx9NQFHopdmBHLny26uR5RCU vRd3mLedGp+NXYtJEz/Sa5CKN49KaNT58yagNx5365PFs/ClkQol8mtFrAu8BKhZCjuT LM4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hMu++LfAmmKpUItr5XJfMXYQtWPwGiIMTXSRYonRvk0=; b=RrNrq4qaokV9ZeaHFt7XpB/88Uc34E0rhdXGVnSkhputJQC7xNrhVMyZVfjahdAQky MSGugSdeot+dIsU/LKkGVGT2ivoQq/Uoi7WGC11O6UwnfngSVNC5NQvDzVMMbe9RPlki 4qb96xQaXFsMKU9peczY45RLHbMtfAV/LsZLmhiElw9gpUfj/VtDKBWfaShQvIGraawq oItPZDTUGK5MNzPHVqJdoo2gm8jSbty4oj90JnoshL5RyB+F5oR9fOLhVot2Sq7USjwk gONiaxZL2zt/gxq1hhkJMPW1zrpAmcrS+D3ieHmwX2gNevU5j1maKzlqi0yLQmxHXKCM 7hOQ== X-Gm-Message-State: AO0yUKXB2wfdVOakYXO5HHo1GTZhZfhSVozXWFTZUEBHlJmz+EnhWvoF AMQz2B5v1VwCVu3L77x74Awozutrj6XblQ== X-Google-Smtp-Source: AK7set/Uz5LXCu0YNJcGk7EHcH4OeV6kPEx54nosjRE/6aw/ja03TDuVRSAk35gLxbWUDjdp3ufayg== X-Received: by 2002:a17:906:28d:b0:8b1:88aa:46da with SMTP id 13-20020a170906028d00b008b188aa46damr1681341ejf.48.1677850028985; Fri, 03 Mar 2023 05:27:08 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:08 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 09/17] colibri-imx8x: drop obsolete environment variables Date: Fri, 3 Mar 2023 14:26:34 +0100 Message-Id: <20230303132642.15574-10-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Drop obsolete environment variables boot_file, bootcmd_mfg, fdt_addr, finduuid, image, mfgtool_args, mmcargs, mmcdev, mmcpart, panel, sec_boot, vidargs. Signed-off-by: Andrejs Cainikovs --- include/configs/colibri-imx8x.h | 35 +-------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 9a4a5f3b5de..94243117f1c 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -8,7 +8,6 @@ #include #include -#include #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x83000000\0" \ @@ -16,12 +15,6 @@ "ramdisk_addr_r=0x83800000\0" \ "scriptaddr=0x80800000\0" -#ifdef CONFIG_AHAB_BOOT -#define AHAB_ENV "sec_boot=yes\0" -#else -#define AHAB_ENV "sec_boot=no\0" -#endif - /* Boot M4 */ #define M4_BOOT_ENV \ "m4_0_image=m4_0.bin\0" \ @@ -29,8 +22,6 @@ "${m4_0_image}\0" \ "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ -#define MFG_NAND_PARTITION "" - /* Enable Distro Boot */ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ @@ -38,47 +29,23 @@ func(DHCP, dhcp, na) #include -#define CFG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs ${consoleargs} " \ - "rdinit=/linuxrc g_mass_storage.stall=0 " \ - "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \ - "g_mass_storage.idProduct=0x37FF " \ - "g_mass_storage.iSerialNumber=\"\" " MFG_NAND_PARTITION \ - "${vidargs} clk_ignore_unused\0" \ - "initrd_addr=0x83800000\0" \ - "initrd_high=0xffffffff\0" \ - "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} " \ - "${fdt_addr};\0" \ - /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - AHAB_ENV \ BOOTENV \ - CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ - "boot_file=Image\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttyLP3\0" \ - "fdt_addr=0x83000000\0" \ "fdt_board=eval-v3\0" \ - "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ - "image=Image\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "mmcargs=setenv bootargs ${consoleargs} " \ - "root=PARTUUID=${uuid} rootwait " \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=1\0" \ - "panel=NULL\0" \ "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ "consoleblank=0 earlycon\0" \ "update_uboot=askenv confirm Did you load flash.bin resp. u-boot-dtb.imx (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \ "${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \ - "${blkcnt}; fi\0" \ - "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" + "${blkcnt}; fi\0" #define CFG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 From patchwork Fri Mar 3 13:26:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751476 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Oiy5bWvR; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpmX3Rklz1yWy for ; Sat, 4 Mar 2023 00:32:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EEACC85D92; Fri, 3 Mar 2023 14:30:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Oiy5bWvR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6CA985D74; Fri, 3 Mar 2023 14:27:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0F5D085D56 for ; Fri, 3 Mar 2023 14:27:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x530.google.com with SMTP id f13so10283440edz.6 for ; Fri, 03 Mar 2023 05:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yZ2HPg1KSoCif/S9eYBz0Ze7sGIt/rC7T96y5sXfgKc=; b=Oiy5bWvR8ncdKRi65vV71Xw8JGnw33+uz9nXQz4FtXP//HmqMYwKKdGi88+pihBhRQ BH6dKVcamy//imCdl8AelhEtTgBfPqSAjeIIm9X8TGfCMhpGrsRlaFtGRdKjrqGl/Mfs z2Mluoh2FsM+zFJrjeSGzq2XT47WBEc7WTdCXM1RSg+bvhJJn5GzERoX6Uol6KM1kGNe 8bsrTDovbn4sDep2LIOFKbCKW3l1wGe7pZ7dQ0o5IgDG5qANWLpu3g5+EhwWl4FOlrM4 +14HJD11DK7Jb59XIDHryMOum3jfaWzBvyENrArBH6l5o2pxF/+G3fCYGU2fQBm9CZ7y VBVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yZ2HPg1KSoCif/S9eYBz0Ze7sGIt/rC7T96y5sXfgKc=; b=E6orU1LjXx0FJ4h0TW2X3iqBS2dhCWIlknDsbOMNAre0d42x6y9m5KEhSZxaAkR9Oi KAEz+cGZB6w10FaYl7jUSjGS3ZPYcj9D1UirK083H4ptENTjjtR37p5T8Rcvpv2bmOUr k3iTx3yS+zGxsE6TiVIjSTIznIOPj5WYii8PkNoy8mOLQjEV8EUCa3ClLgUeReZ5X2hf 4Ket1f8pF3MIc/nFsONPty0giufdjooCj0Kvp++SLpfu8LouYdm8JXxgoE/yCFxzvSWX 6caAg8+G4sdmiuvoAGpZUdO0TazGhaQ9ZYb6PSoxiU7HxwM0DOrg2+XLyT23ugwcUyZ0 ipqg== X-Gm-Message-State: AO0yUKX7uPhwUslE1XxZ5mP2gznG9JTu9AdN0ddWyRQO1awyZpUEPCKj ikphnd8V8To0mUjbRI7iht8= X-Google-Smtp-Source: AK7set+cj9uLh70ReqUmgx7lfngPtRYT+M5adMX0BYR7rVd80A+dlJCJU30+7mFyfM4bBZ8UZYmCKw== X-Received: by 2002:aa7:c147:0:b0:4bd:e63c:d3be with SMTP id r7-20020aa7c147000000b004bde63cd3bemr1821304edp.20.1677850029801; Fri, 03 Mar 2023 05:27:09 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:09 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Igor Opaniuk , Andrejs Cainikovs Subject: [PATCH v1 10/17] colibri-imx8x: provide proper CONFIG_SYS_PROMPT Date: Fri, 3 Mar 2023 14:26:35 +0100 Message-Id: <20230303132642.15574-11-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Provide proper sys prompt, which should be "Colibri iMX8X #". Signed-off-by: Igor Opaniuk Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 6c1c9978d11..a39219db58e 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_TARGET_COLIBRI_IMX8X=y +CONFIG_SYS_PROMPT="Colibri iMX8X # " CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_SYS_MEMTEST_START=0x88000000 CONFIG_SYS_MEMTEST_END=0x89000000 From patchwork Fri Mar 3 13:26:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751477 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=SvypjoaJ; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpmn0ln5z1yWy for ; Sat, 4 Mar 2023 00:32:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD9FC85D97; Fri, 3 Mar 2023 14:30:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SvypjoaJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C87A85D74; Fri, 3 Mar 2023 14:27:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 05F3485D72 for ; Fri, 3 Mar 2023 14:27:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x536.google.com with SMTP id o15so10120743edr.13 for ; Fri, 03 Mar 2023 05:27:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Db6ONqIUQvp1jBGXM3NNuezHEJSKEQooSC+dGqrvhCs=; b=SvypjoaJb3pj6DR5kb/M2KV9t5am8dTdNdTFKeDbFuO+MDDrfcv/PEml7YBSf1o8pa uWklnuXnTC9VX8pNWceV+SSp6jc/0WinEg95L95rSbxoSPWKC4Wa1Z6jOtjnG9v4G0KB BCpxKyOU6DlPYEBLEGzxrioKrFHRQe9WS4Hu8brrhQReBSkue9ZOF6GUHPMr/88fJwj8 FBWb7+H8PiqnyqT/autXGgvhUj1GGeIrrGvZ/1Fraz6VvzHjQjmn0BeXAaHgCSFgfQ9v 0fwSirlGorliup0IOACPcczr7u51rrDvDromjcQ+1gKx/OsyyOyNXiX7cRqsayZE2w5p UaxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Db6ONqIUQvp1jBGXM3NNuezHEJSKEQooSC+dGqrvhCs=; b=XHBlEh4/LnItZPyIBfxDpcZXWmQq00Lv/u6nbNiHSuX3ilXXVtN4954/Usf9+G+zHU Tu4FdJxAbx4yOYmKXqOgd+M9zFqDb6Tx0HZT3J5LLa/om2ctG9L7u8/qx9ra6CMM2VF4 EUG2ndXnz3UhcPnsJo74GJ4rdOyalDnWaPyhqwy3rpLEHSiBgs1GDUNpCvFFOf82ecyl IAWIYvn40FgktVYYt+epobPcnMXttizPWaFgPZqA/vFe1NKiHr+0iRCfzYQRASVU9qQ8 kQvjcnO0Nha27bssvS8Ydyg3mHmuyiPabaPF8lQCXCqSAI58iQt8gZNpZIY0p6jnUlif VpWg== X-Gm-Message-State: AO0yUKUAD7NAlTV3HTyPGAwLrbBistq+ouXArAUBJe70QT+wcM0SkpDb 7Hrg5X58Jnj4RHrXFGhgHpY= X-Google-Smtp-Source: AK7set+5atuzjV+k8KvDS7fYMf6ZZQnVJQkex80/f7XPpCRuzy70Q9/vpuVRs6YlklRIA3VperqrEA== X-Received: by 2002:a17:906:30d3:b0:8b1:3d04:c2da with SMTP id b19-20020a17090630d300b008b13d04c2damr1582662ejb.45.1677850030740; Fri, 03 Mar 2023 05:27:10 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:10 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 11/17] colibri-imx8x: switch from fatload to load Date: Fri, 3 Mar 2023 14:26:36 +0100 Message-Id: <20230303132642.15574-12-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Make sure M4 binary loading works equally well on ext4 as well as fat file systems. Signed-off-by: Andrejs Cainikovs --- include/configs/colibri-imx8x.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 94243117f1c..b4814bdfbfc 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -18,9 +18,8 @@ /* Boot M4 */ #define M4_BOOT_ENV \ "m4_0_image=m4_0.bin\0" \ - "loadm4image_0=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ - "${m4_0_image}\0" \ - "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ + "loadm4image_0=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4_0_image}\0" \ + "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" /* Enable Distro Boot */ #define BOOT_TARGET_DEVICES(func) \ From patchwork Fri Mar 3 13:26:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751478 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=cwkvB7G4; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpn14QJwz1yWy for ; Sat, 4 Mar 2023 00:32:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72FE085DA4; Fri, 3 Mar 2023 14:30:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cwkvB7G4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6F66885D5D; Fri, 3 Mar 2023 14:27:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 1B9FC85D70 for ; Fri, 3 Mar 2023 14:27:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x52e.google.com with SMTP id cw28so10307995edb.5 for ; Fri, 03 Mar 2023 05:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IHbYZcqMDxwzGs2gCx7LXNrfQw6NfrNHMecP7iTihjc=; b=cwkvB7G4ID2C72NeehNfTYljt8wbpdzOMPD8NFAv2JQt3j1aMYijBiMVH81Hd03yrj M4ITcAD5Xc4dmLq2KzxUZz0QxNKYKgbdgKscRwq1s+15//mxgoHBMcQyuAnt/3vwEvpF GVrq89eRN3uBELb6i5wV9oWGrJLC7qLP7OYkVOS/t5Au5Ng/md2qmMGLImcpPOEw6rih 5hMuDoS0D8haIApK15v08pR+b9ku0sdiF3wjZt1bdcdvA3VP0r0iSUA1t81u6rnCWEnM GC+ytXqPSbzX6PcAnLUkzPcwez8/4tlfLYKiwo+go+wuJWdagrhWx5JxRR7gGcyD9lXs a5Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IHbYZcqMDxwzGs2gCx7LXNrfQw6NfrNHMecP7iTihjc=; b=F0AZ1TmD1AeMK1r7/QY+SgYvpt7bZniUjN51D5kkR/NC6px1OBBJfgnCgPoqtUe/lN 18ZHbtYo2/ja3BgGUJkk4a5HZtGBx4Ixxit+xFiaKjoL5uD/IIVzQSwQG3LUGMzKA87O ic4rk7Zc1BKZRxlxFds9gw7NOHmS3+lUXIBEag9spbtiGOfDa3qsUJAh4TAkoiwHSY2b oSnmh9A0KIH3WBhh4v4B/Qyebw2Hiy4weFalMlwdt0SiOG+opZICyKfJi4l3ueGz6XWZ UUQDte4bN0Ua3D2hxOx411T1IOrttl6sWdoErAjgiqEqdI6C4GSHH4bq/yULgap1d4BX Ur4g== X-Gm-Message-State: AO0yUKUOzD/gyJ2LgwptGUOYrlA2Hu6MmSn9EJbcWrSCSQSdg2kjxxMX B2MEs7VubK8jUmMenf8cYOQ= X-Google-Smtp-Source: AK7set9iFKhnzTXAxDkzhveKoLAOw0LhvBCVkgIhWxUNgA+9iwKM+15CMxPwDvQVh/GrqBd7ZaJygw== X-Received: by 2002:a17:906:6d85:b0:8c3:3439:24d9 with SMTP id h5-20020a1709066d8500b008c3343924d9mr1318578ejt.24.1677850031524; Fri, 03 Mar 2023 05:27:11 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:11 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 12/17] colibri-imx8x: update env memory layout Date: Fri, 3 Mar 2023 14:26:37 +0100 Message-Id: <20230303132642.15574-13-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Update the distro config env memory layout for the Colibri iMX8X: - kernel_comp_addr_r=0xb0000000 temporary area for uncompressing (ie FIT images or Image.gz booted using booti) - kernel_comp_size=0x08000000 - loadaddr=0x95400000 avoiding any reserved areas located before that - fdt_addr_r = loadaddr + 128MB - allows for 128MB kernel - scriptaddr = fdt_addr_r + 512KB - allows for 512KB fdt - ramdisk_addr_r = scriptaddr + 512KB - allows for 512KB script Idea of memory layout taken from commit a9f1e35bedc4 ("apalis-imx8: update env memory layout"). Note that for our regular BSP Layers and Reference Images for Yocto Project an updated distro boot script is required (see meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot-distro-boot). Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 2 +- include/configs/colibri-imx8x.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index a39219db58e..53002c9537d 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -10,7 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_TARGET_COLIBRI_IMX8X=y CONFIG_SYS_PROMPT="Colibri iMX8X # " -CONFIG_SYS_LOAD_ADDR=0x80280000 +CONFIG_SYS_LOAD_ADDR=0x95c00000 CONFIG_SYS_MEMTEST_START=0x88000000 CONFIG_SYS_MEMTEST_END=0x89000000 CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index b4814bdfbfc..750336b0eb6 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -10,10 +10,12 @@ #include #define MEM_LAYOUT_ENV_SETTINGS \ - "fdt_addr_r=0x83000000\0" \ - "kernel_addr_r=0x81000000\0" \ - "ramdisk_addr_r=0x83800000\0" \ - "scriptaddr=0x80800000\0" + "fdt_addr_r=0x9d400000\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_comp_addr_r=0xb0000000\0" \ + "kernel_comp_size=0x08000000\0" \ + "ramdisk_addr_r=0x9d500000\0" \ + "scriptaddr=0x9d480000\0" /* Boot M4 */ #define M4_BOOT_ENV \ From patchwork Fri Mar 3 13:26:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751479 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=kIP+4ARd; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpnG3P1Wz1yWy for ; Sat, 4 Mar 2023 00:32:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 35AEB85D95; Fri, 3 Mar 2023 14:30:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kIP+4ARd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1AFDE85D5D; Fri, 3 Mar 2023 14:27:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 B329485D75 for ; Fri, 3 Mar 2023 14:27:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x534.google.com with SMTP id d30so10337741eda.4 for ; Fri, 03 Mar 2023 05:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VNiv6e+iHrlG1BUfXQVezBuHyVQk1JIspJMIMmwlUhY=; b=kIP+4ARdos6kQbtv3uyojiyG1nzcJaPwzhNo+yjEgTjF8lZ4huMiOxP0l/o2sBUPU5 FgtVtrd0NuAQ45VAs0qK9J15nJT2A3iWnCLYQEOnMmyP+JB3vH/aY86NJNumYTJ209xe jHYOlsStp1aiC0bTO5wM1wbSQsKzZa9wDTn3CCa3NygFC+i4RDp1IoWfctC9KSrIvGfQ qKS7osWkBhcW5P1hsbO+9mTo3niDLavCNj+1BJyfKa7ShD6nuPvR5qwaXPOVy0Gw8rQH 5Ow9R8x7Z+hoh53f31eAl4EL9fxqmWebwTL/mnoXlm+97/U7iBBP7UAbGnRkRa9WYwko T29g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VNiv6e+iHrlG1BUfXQVezBuHyVQk1JIspJMIMmwlUhY=; b=03nRGrPxb5vE0aDshqtmx6/dJLSlwHW9QsuPrRInIJUsAlYTsT4//GWXlMLuboROkQ OmFbxp+LcQBOXxm2m24LwW9f/yywiytee3xBWRW3J9SEzef0cp6TyBXTdzdpNFWH5pso 5EFG15dA3fv2ZpMSSik18yq9htN5dGTLiRBT9JHvKRXo95Wd/hgo73nxRqgibO/2IQFF h+iHOMH4MH5YquPeRrbT8YAqOd2CiP1f+4Ds0rccr71jn1ERSWYmXg3ok7HsvH2oQb1e 2Rgh2eN3QgIt2Z3ptKZApTYyNmLkr6Pf4trhWrT/1KZyUC0JfPKDIdZSggtL+e3ghpXF Uysg== X-Gm-Message-State: AO0yUKXVOb4+dtLojMwHNt9hjIHHptVFT0fteqrvvJUsINvnVfCnEbgg hYYxrRxMDBuJ6hA7r9X1TTI= X-Google-Smtp-Source: AK7set+k6D3k8SjbWAD28hWv57UXI5Lz/Kzl7zcmGtA3QnwS66Dm44a184eJlOjvo1WWhSL2doCDew== X-Received: by 2002:a17:906:5d07:b0:8b1:3467:d71b with SMTP id g7-20020a1709065d0700b008b13467d71bmr2191498ejt.48.1677850032508; Fri, 03 Mar 2023 05:27:12 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:12 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 13/17] colibri-imx8x: set bootaux memory base and size Date: Fri, 3 Mar 2023 14:26:38 +0100 Message-Id: <20230303132642.15574-14-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Move i.MX auxiliary core memory base and size configuration to defconfig where it should belong. Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 2 ++ include/configs/colibri-imx8x.h | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 53002c9537d..08d284bf912 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -8,6 +8,8 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 CONFIG_TARGET_COLIBRI_IMX8X=y CONFIG_SYS_PROMPT="Colibri iMX8X # " CONFIG_SYS_LOAD_ADDR=0x95c00000 diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 750336b0eb6..042fcb8757f 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -54,9 +54,4 @@ #define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */ #define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */ -/* Generic Timer Definitions */ - -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 -#define BOOTAUX_RESERVED_MEM_SIZE SZ_128M /* Reserve from second 128MB */ - #endif /* __COLIBRI_IMX8X_H */ From patchwork Fri Mar 3 13:26:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751481 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Lhj7FSt2; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpnn0CqCz1yWy for ; Sat, 4 Mar 2023 00:33:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D49285DB0; Fri, 3 Mar 2023 14:30:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Lhj7FSt2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AB5EF85D59; Fri, 3 Mar 2023 14:27:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (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 D5D6485D8E for ; Fri, 3 Mar 2023 14:27:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x52b.google.com with SMTP id o12so10217216edb.9 for ; Fri, 03 Mar 2023 05:27:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kC6yjRIV6Lz4WJ/bASt/Dwe1BBN4sPUmEoRvvyAm0aE=; b=Lhj7FSt240KayIlNf0njGmvaixcp6XaPpxl59QUYwXdc0C37v+D/T+49wvHGSJlgeW VCD2dOqcGVGnTPyBa0rCK1WpeHi98zKzOOternWnnxjg4lBaZdCm6ibWQOXQkgo4RJWG sUP2uboRYDYQu3cm6PI5M1YgU8GvavwNJnFGBl3dnb26EvNsvswQcROIGIXdeV1dnzRj KnRKwRBt73Nf1CMZi72x0yxkdPWre3AjkfADooW9+7Mg/iPDT7z7+l9JnukLIpY1nbW+ jj0/7RyIUP1fHepDqY/HlDrnJIJzRlNvE3xJlt5MeyvphNp04cShbBgeynzz64OItd70 qn7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kC6yjRIV6Lz4WJ/bASt/Dwe1BBN4sPUmEoRvvyAm0aE=; b=gaV+JWPemVWWRxpJZ0GhAxdA+N8VaoUqJeF5LnzETEZlsLGKC/bd3lrwnMiHwFHcMX 2EgLXsGsmNrCfbjg0qz9SEUgj0KWSlWVFzGZpDQfsX1j7PBpQQeczUTjYG0BZg2BauWW UZn3itYYNLhW6jWISzJpvkBlKI1aeiKTvhDTwoLf+BdizbpN0zgX679zKTO6KY+vhnZc Oo5l1dUHXeE9U1RtMBDs609wuQYRDJjkoW+eoR+TVKwuinuz5zMUcPhZ879W7yU04A9Y UcodAvD7reeJ+mCTQtpNsK3pHe+3Tg8j2B1tGN+Pek4n1ULJcU+aTL9gUko6Gjcf5Aq4 CHHg== X-Gm-Message-State: AO0yUKWzrShrdOkJTieoUxb8HLpu63eB3a2MmoRY8WV6OPsBVF0tE9yT gHYiJMndSbl7LJpWIBndoPk= X-Google-Smtp-Source: AK7set9aiiV4vT1qgZW9MPO5cQy7bvKTxtLhClOaePhd4eC3tFweI7R57y7tD+O9dR7Cob5ZW48YJA== X-Received: by 2002:a17:906:1405:b0:8d7:153:1486 with SMTP id p5-20020a170906140500b008d701531486mr1490285ejc.20.1677850033647; Fri, 03 Mar 2023 05:27:13 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:13 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 14/17] colibri-imx8x: enable environment bootcount limit Date: Fri, 3 Mar 2023 14:26:39 +0100 Message-Id: <20230303132642.15574-15-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Enable optional environment bootcount limit functionality. Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 08d284bf912..bebe87ac918 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -59,6 +59,8 @@ CONFIG_USE_NETMASK=y CONFIG_NETMASK="255.255.255.0" CONFIG_USE_SERVERIP=y CONFIG_SERVERIP="192.168.10.1" +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_CLK_IMX8=y CONFIG_CPU=y CONFIG_FXL6408_GPIO=y From patchwork Fri Mar 3 13:26:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751480 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=nJNmct/Z; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpnW2NDNz1yWy for ; Sat, 4 Mar 2023 00:33:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C98D85DA0; Fri, 3 Mar 2023 14:30:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nJNmct/Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D577585D5F; Fri, 3 Mar 2023 14:27:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C85B185D6D for ; Fri, 3 Mar 2023 14:27:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x530.google.com with SMTP id f13so10284302edz.6 for ; Fri, 03 Mar 2023 05:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=puEIhK/Bd1gT3tjfuJWhTwmW0pxO5unx7Q5mjvoSbxo=; b=nJNmct/Z/oGeTjr5FgSF+ABee5mVFWI37ad9bo74qKV+CW1Yf+9G9OTwigkxjFWGB5 9Q+iEyQ65PKbNIUu7HzUgH3yoFj/FR6qCE/5ldKshy/uPf+BjjjEMqJqxAZuNcnIYdON yotSUiX68Sem0sXgw37Qmw/V7pbKQ9164LqCIjGMUkj8NeHhWBmkYRYkZmbMa+lQQqrv P4c4eepRIqBZ83UOyFGy/qhiwfK6l59wp+sT32T1P1iAx8U4ywsEzqkXxYrEoA11J51m KqUEYPEo6MUphZJjRmEBeMbgPQTnvjpAj2a/MlSVi9osqjV+wZpM8MrqhlFpoQl/yCcN kEcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=puEIhK/Bd1gT3tjfuJWhTwmW0pxO5unx7Q5mjvoSbxo=; b=Q6nnTxhSJK5vyZ60qpN6SQRwaFalv2b1AZ3rHW3EVwc3eOXvSWjs3cFC7z5PrBpyiF cL+laxBcR7JBBpv1OhxklKRGfreoZ3ZiV6EQTY/NoUoHkCDMXWH7sJtrT0Q9OKB3avII cB/hf4gLhTi2zIIlkEqnhceNS+pJPU+R4f6Mcz6Okcx3qWLA+1ku5th+vKJNOdfAy+bq js/UA+3ximzx6cyI6McBeF6Gy5/SAaZJLENs3AhgNlSnvLfgl6Ar1dGWmu3miEIvTXvL IJNJ//e23VG2QqiG4zY3K+g26Q9TaTv7ffGGfHDVwJM4DXOvjUg22FKE1UqSKCYP2hIX nznA== X-Gm-Message-State: AO0yUKUOi1j3hTLiwF26hq4edxieZHDKIOtGEFFXFyi1ra42xtuorYVO kLeSrXZvwQuOjJQs+M70o6M= X-Google-Smtp-Source: AK7set+gCu8k8KBKgLXNPmvfF2OuysRqL2TW4xCZ6GXT3EtdEDgA+wz/Aw8y1Tzg3qLJwVQ3OiidmQ== X-Received: by 2002:a17:907:6d87:b0:8f6:52c:afa0 with SMTP id sb7-20020a1709076d8700b008f6052cafa0mr1883662ejc.23.1677850034537; Fri, 03 Mar 2023 05:27:14 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:14 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 15/17] colibri-imx8x: set bootdelay Date: Fri, 3 Mar 2023 14:26:40 +0100 Message-Id: <20230303132642.15574-16-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Set the boot delay to one second. Signed-off-by: Marcel Ziswiler Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index bebe87ac918..450cd1981bb 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -23,6 +23,7 @@ CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTDELAY=1 CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb" CONFIG_LOG=y From patchwork Fri Mar 3 13:26:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751482 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=O0thQ0z3; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSpp21Dszz1yWy for ; Sat, 4 Mar 2023 00:33:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A23485DB4; Fri, 3 Mar 2023 14:30:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O0thQ0z3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 663CE85D5D; Fri, 3 Mar 2023 14:27:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 B776185D6C for ; Fri, 3 Mar 2023 14:27:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x533.google.com with SMTP id cy23so10147181edb.12 for ; Fri, 03 Mar 2023 05:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jv6LkLj4lRBtue1t6/9BX8QGDERd7LCJ3atPRuV4KL0=; b=O0thQ0z3aCHHvTkrOl2QcFrX3vgBBcTQqiSQE6MhytOKl+53UdMZ13RgN37kw30xyB nMM95f/nJc1P4sNZPUeiTmJypKnYu5lO51UscioUdCUWwhpDtMTMOGhNS4WX172/kTNG fBwvtsLubeZo9G1UCV97R77UjZBe/JUIeuDfcVu74PEfMsSECqONXxaNazgITu141n+C VXS7crwef3i6Yvn5nkW+asVQWl3t3oO34mhyeki/nzvYolWknvAKvyDI62YbnOpts/Iz V8xL/t6pNyS1KamGBkz9s7DNabb+SZcLv/bxJyVusfE/xUJsJAqpPiNfgiGsjn++fRdi jw0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jv6LkLj4lRBtue1t6/9BX8QGDERd7LCJ3atPRuV4KL0=; b=G/Qn86W99ikq9qmlKDHUp4ovsWb3Y8qFCIRjygQk7rCdcmIiGt4N8Xgw+27dPSXVFu SVnDzY7vmqREdqtVsLRt12LBLMy0j1YixtM6eobathhDdAU0za2AWLSsRyQHdtWSRjG7 so/hXLTGFXKSrFcmYaMYCE1f68XjUDGujuQ8Wnfrt4ZsvwYXfRT18RVOeJ5LhYIKornW /QCW8LD1faa+7+wK4fAWtLMuMNKemAcmBkpfUbXkhD0Qzkpq3eMnR48u7Efgr2Qgw8b0 RiSwF2YDilhr3GmezLqeUF/JvXlKbkU+slm6UqmL/YvS08EH7EWPJQD6EAMBHiwnJsKD DNyg== X-Gm-Message-State: AO0yUKVCd25gzZnJn++jfplQ98+ckyHeEQaBKSTUeCvSKUOdjpPiSNEE NukOt92r45EGz4VUH/YdG4A= X-Google-Smtp-Source: AK7set9DhFQo9NGLIH1EoKWdUy9SUakXJbyyXlv6dGg521pgF/8LWHCSJXcP5Xon2XgfOuInnH1KdA== X-Received: by 2002:a17:906:1c13:b0:896:427b:148 with SMTP id k19-20020a1709061c1300b00896427b0148mr1536675ejg.1.1677850035304; Fri, 03 Mar 2023 05:27:15 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:14 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 16/17] Revert "imx: imx8x: colibri: switch to binman" Date: Fri, 3 Mar 2023 14:26:41 +0100 Message-Id: <20230303132642.15574-17-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This reverts commit bdadc140a127b14a666d2007eddc3f65c8de7d5a. We do not want this, see [1]. [1] https://lore.kernel.org/all/56cf058164f331ce99ce75b0751b825ee2e07fc0.camel@toradex.com/ Signed-off-by: Andrejs Cainikovs --- arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 2 -- arch/arm/mach-imx/imx8/Kconfig | 1 - configs/colibri-imx8x_defconfig | 1 - 3 files changed, 4 deletions(-) diff --git a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi index 91e2944781e..322429a98a7 100644 --- a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi @@ -3,8 +3,6 @@ * Copyright 2019 Toradex AG */ -#include "imx8qxp-u-boot.dtsi" - &{/imx8qx-pm} { u-boot,dm-pre-proper; diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index 37d12d18958..018b87b85b7 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -51,7 +51,6 @@ config TARGET_APALIS_IMX8 config TARGET_COLIBRI_IMX8X bool "Support Colibri iMX8X module" - select BINMAN select BOARD_LATE_INIT select IMX8QXP diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 450cd1981bb..8b4592020d5 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -20,7 +20,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y CONFIG_FIT=y -CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=1 From patchwork Fri Mar 3 13:26:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrejs Cainikovs X-Patchwork-Id: 1751483 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=F8Qb54jZ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSppH4tDxz1yWy for ; Sat, 4 Mar 2023 00:33:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EFBCC85DAB; Fri, 3 Mar 2023 14:30:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="F8Qb54jZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9C27B85D6A; Fri, 3 Mar 2023 14:27:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (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 C4F0F85D6B for ; Fri, 3 Mar 2023 14:27:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andrejs.cainikovs@gmail.com Received: by mail-ed1-x531.google.com with SMTP id da10so10355160edb.3 for ; Fri, 03 Mar 2023 05:27:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QDIClS/Urs7n2RbTXXszjSQk9xhKafzi/M4cpF9IKdU=; b=F8Qb54jZR3nOsVgJnko1222CED2iFbqjkiMD+iabFw23U+yTAKLY/O/m/Hl6MwD5uA gGOyJ3bq0PuqWw3XCHXLc+efUMM04YRKL72KXvZAqvXcZS170oIUnwthA9yx1OdYaElC HCNA11eydpe3xAVdoXcOE7X0Pi8YJzZq4Vy/Vrdh+XLdx8hV7kEmh/tVN225HHhwOEyD CnUJ7mtacu9PImUejVAlzBeBIVJqQvZA8jSYECqUL/aMCDfMWxgTH0strrx4RkaY6EWo O4yvf0w6jiJNgKwHqSUxbJw68XdnMGg4f80QX4Qg9S7oBPu4oC+vFBVX2uShXWW9JDsb lTHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QDIClS/Urs7n2RbTXXszjSQk9xhKafzi/M4cpF9IKdU=; b=myicAQz2SWyFzY5ZQlMJIWXavjdfDyKKZoyeckeXq5bJBsvJ7TmSptKMFeyNket5LM YD1q1Ls5dY1kZafA+8b0p9/pIhtQ4NWh2oneJeTeaBbroYrUY+Lm2TXOiHwya8PqLb+g Hm9B76usC0lqPXw4SengcFMoB2zAVwkHK/np/aIR3i6CpBIzeKiBTLCcNddo7/d6lh9K IWFQRjy9PfNMtJXBjHyYGV36dGYH9EwF9h92tfMRHLhtCpXvUT0adDsyqMQsgS06jrKt Y33XoxuQZ7PPOQWwLOCE6MhynpoANXJ4450sBojCS7M5pxSgo3gnLzOYf4BSZIrXuspc komA== X-Gm-Message-State: AO0yUKUm8EZA16NGuWyBFfjser7aIGHYlaTGvH+s3URx71U5DIqHCJ63 r7Xz32fR2YbWK9d4prENWrcpi9OT6GgVRw== X-Google-Smtp-Source: AK7set+iR42fYaHUYzDCJ0pbgs3khNwwtJG7HCbdnEg+bW1BLc0QYQfDg6c6vx0tYI7C2f+4QTJS0g== X-Received: by 2002:a17:906:8a64:b0:8b1:bafe:6135 with SMTP id hy4-20020a1709068a6400b008b1bafe6135mr1462339ejc.60.1677850036422; Fri, 03 Mar 2023 05:27:16 -0800 (PST) Received: from localhost.localdomain (35.145.195.178.dynamic.wline.res.cust.swisscom.ch. [178.195.145.35]) by smtp.gmail.com with ESMTPSA id pv16-20020a170907209000b009079442dd11sm948645ejb.154.2023.03.03.05.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 05:27:15 -0800 (PST) From: Andrejs Cainikovs X-Google-Original-From: Andrejs Cainikovs To: Stefano Babic , Fabio Estevam , Francesco Dolcini , Marcel Ziswiler , "NXP i . MX U-Boot Team" Cc: u-boot@lists.denx.de, Andrejs Cainikovs Subject: [PATCH v1 17/17] colibri-imx8x: enable fuse command Date: Fri, 3 Mar 2023 14:26:42 +0100 Message-Id: <20230303132642.15574-18-andrejs.cainikovs@toradex.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> References: <20230303132642.15574-1-andrejs.cainikovs@toradex.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 03 Mar 2023 14:29:41 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This command is required for initial SoC provisioning. Signed-off-by: Andrejs Cainikovs --- configs/colibri-imx8x_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 8b4592020d5..43aa4230ff9 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DM=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y