From patchwork Wed Jul 15 10:30:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329361 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DvXXkjsz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DFp5yPTz9sTM for ; Wed, 15 Jul 2020 20:31:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1C5EC81C2E; Wed, 15 Jul 2020 12:31:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="DvXXkjsz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3C780819EA; Wed, 15 Jul 2020 12:31:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) (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 8ABF181BAD for ; Wed, 15 Jul 2020 12:31:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x229.google.com with SMTP id h19so1924549ljg.13 for ; Wed, 15 Jul 2020 03:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xDk6CUze4xhGPJxom3Dyk5OjTfKHH6z1F6RUZw4cBkc=; b=DvXXkjszAz3yF6KtGHMCt6s05vRmGrWGxoEMuf3TMt0s3TxcJTd6WgGD8ixnn+c2kc mmH0SoLpqM+SoCOWsaM21z3385+TC6kI9bOPAIfx1PSATn+AAUlPMu5odPb6LWtV6lps sksPyBFbN/KsFbEmQAVivo9teEti61lmiCtM05ozOkNq8E4FgroXU7G9CANAaE05Ih1V BTPgjDhG38q1wuBmttM8TNP1un279u+bafTFc8Tr7jGnu+npkGd4pmsD5TE/yQAYTc6D zbToe9kEkHSXuCC7LRST6NMkXQCq0qvQQ2obWjOz9FXHtf/1XcniyaVIEG9YjKBUdsRE NcRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xDk6CUze4xhGPJxom3Dyk5OjTfKHH6z1F6RUZw4cBkc=; b=i6LkdB9phrjjPCLilt70D5T9JXUL+MFTQVL4OdZQDP2SRmgrtIj1QpUeot6fs8NGvq X2QFb18iRvnTVNqzzNwLJKHIBk1X2ntUd4NHMg6rmN/+bDeIsCCmXTQ2MzxAFNO5B01b fzsNnH9aHEZX13neHGEOAK7mDhrJEWXU51pEUSoEBipIEPGw8+rLeuk1GQo47o6JpYGl hidLYvrFynoBCF9iwTyhKhFPwYATPr+Ah+mn9aGzoE7laUJ40cQ3p+7EKEvQ1+9n8Mbn Juq7fbNIexfmZ7Jun9VOSKu4Dh5o+jp6Nem6QVJLgjKzzEkHcsREO1XVAZnTAIpfUYlN 9anw== X-Gm-Message-State: AOAM53365yHalFqKk7kHqx/J+sS+rkucqGn007XXHXK583Kg42unM1oK cobsFvWO70QX83FZGyBGpg8DilfQNMU= X-Google-Smtp-Source: ABdhPJxRnjgX3XFf3lI/9qW2bHeQpigq7REtQWR2t5EFbpp2YRJHBdImg6rRWeZE3PydhYd/dm77mg== X-Received: by 2002:a2e:9857:: with SMTP id e23mr4720686ljj.411.1594809080908; Wed, 15 Jul 2020 03:31:20 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id x13sm371587ljj.92.2020.07.15.03.31.19 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:20 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Joe Hershberger , "NXP i.MX U-Boot Team" , Simon Glass , Stefan Agner Subject: [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table Date: Wed, 15 Jul 2020 13:30:52 +0300 Message-Id: <20200715103105.8622-2-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk According to i.MX 7Solo Applications Processor Reference Manual, 2.1.3 Cortex-M4 Memory Map, M4 can address only 1536MB of DDRC (Start Address: 0x8000_0000; End Address: 0xDFFF_FFFF). Correct DDRC size to 0x60000000. Fixes: c0f037f6("mach-imx: bootaux: elf firmware support") Signed-off-by: Igor Opaniuk --- (no changes since v1) arch/arm/mach-imx/mx7/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 798fe74a3d..9cb61f5c34 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -218,7 +218,7 @@ const struct rproc_att hostmap[] = { { 0x00940000, 0x00940000, 0x20000 }, /* OCRAM_PXP */ { 0x20240000, 0x00940000, 0x20000 }, /* OCRAM_PXP */ { 0x10000000, 0x80000000, 0x0fff0000 }, /* DDR Code alias */ - { 0x80000000, 0x80000000, 0xe0000000 }, /* DDRC */ + { 0x80000000, 0x80000000, 0x60000000 }, /* DDRC */ { /* sentinel */ } }; #endif From patchwork Wed Jul 15 10:30:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329375 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=NwWRGc1A; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DPt4NFqz9sTM for ; Wed, 15 Jul 2020 20:38:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB10681B7D; Wed, 15 Jul 2020 12:38:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NwWRGc1A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C33B81B65; Wed, 15 Jul 2020 12:38:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) (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 2060181B65 for ; Wed, 15 Jul 2020 12:38:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lf1-x12c.google.com with SMTP id t9so794749lfl.5 for ; Wed, 15 Jul 2020 03:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2+k5nU77saVZCBKCClfLYB1I3K9T4CWj2tL6U2EIBs4=; b=NwWRGc1A0YclvcBp6YZuiNNwGPtzIGVlgRDmUOS+iDlkAS9T55qzPVLBEDTV5V9LAZ aLVH4FcQesl4zZ0uP3JEvsxlaeQEy5JKYrMMsk/cWtMqbpEWXqJYrBgBfCg7McjROGSl LLFHPfbmVn16CjyBvw0tqQ9gpMskRUCPCX4Ga5Av+rnTIi83hVKqTOPnFtLgWB6UThMN ckX8PconlKGICf1qaMiLD9bJyFYuyNUFB8oeGSUiB5ODlR3LmzQ/Kal6iLKS9MjXSloV 0G4bqz+DMMzgr5paHSns47xg5EUjHKwop9CtgIrZgCPa4I7qMrVGbV2rTajvwKqi13xM HoqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2+k5nU77saVZCBKCClfLYB1I3K9T4CWj2tL6U2EIBs4=; b=l0dPmGPz86tImN7NySfF1O2EX7XmMhnxjjjLAKHYc2D+IjF+tORVH798wlhzqKPP4e MDWjub1v742PQl35zHzICT7gLwaR7fH2jQBiTifatO2JjkMYHiiQkQvCBJMb7yRYB5Al a8V1Jpd6CvAq7KfdR1GLVHtz+AVwYkyEsBCUc4/ZepPz75P3XF5vJITldceMXgEjFVVH n9lA9Fqa823X/qsdi2FhT5TOP5LKkfnsM2nue1rZ5xyT903i6UI1eoGIwAM8CZ4zsahw PIjfLgA2kJ8KHwjzMQuGUBhStgptCy/spCbPIQUnyNRKaD+DAm2NvuwznKNa/GNICguv /fIg== X-Gm-Message-State: AOAM533X9mMYzBI8qtPpEBS/x8/Vc01JIZRIGH/ZA5KPXFH/4BzdjW/M 9Ug8BsQHYCJZdjvU30bxRe2TI1s9WM4= X-Google-Smtp-Source: ABdhPJygqju8yYpkH5ZR9YW44inXy15xy2MYhPRvMDa5P5OFTNx2KMrfjhy2Y0WQbKgo+FcnYQgqwQ== X-Received: by 2002:a2e:864e:: with SMTP id i14mr4580377ljj.441.1594809082992; Wed, 15 Jul 2020 03:31:22 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id c27sm406035lfm.56.2020.07.15.03.31.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:22 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk Subject: [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers Date: Wed, 15 Jul 2020 13:30:53 +0300 Message-Id: <20200715103105.8622-3-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk These functions wrap functionality for storing config blocks in EEPROM. Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/common/Makefile | 1 + board/toradex/common/tdx-eeprom.c | 90 +++++++++++++++++++++++++++++++ board/toradex/common/tdx-eeprom.h | 14 +++++ 3 files changed, 105 insertions(+) create mode 100644 board/toradex/common/tdx-eeprom.c create mode 100644 board/toradex/common/tdx-eeprom.h diff --git a/board/toradex/common/Makefile b/board/toradex/common/Makefile index 6b9fccb6b9..7b19b6e4c8 100644 --- a/board/toradex/common/Makefile +++ b/board/toradex/common/Makefile @@ -8,4 +8,5 @@ obj- := __dummy__.o else obj-$(CONFIG_TDX_CFG_BLOCK) += tdx-cfg-block.o obj-y += tdx-common.o +obj-y += tdx-eeprom.o endif diff --git a/board/toradex/common/tdx-eeprom.c b/board/toradex/common/tdx-eeprom.c new file mode 100644 index 0000000000..fbc267dab6 --- /dev/null +++ b/board/toradex/common/tdx-eeprom.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2020 Toradex + */ + +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +static int get_tdx_eeprom(u32 eeprom_id, struct udevice **devp) +{ + int ret = 0; + int node; + ofnode eeprom; + char eeprom_str[16]; + const char *path; + + if (!gd->fdt_blob) { + printf("%s: don't have a valid gd->fdt_blob!\n", __func__); + return -EFAULT; + } + + node = fdt_path_offset(gd->fdt_blob, "/aliases"); + if (node < 0) + return -ENODEV; + + sprintf(eeprom_str, "eeprom%d", eeprom_id); + + path = fdt_getprop(gd->fdt_blob, node, eeprom_str, NULL); + if (!path) { + printf("%s: no alias for %s\n", __func__, eeprom_str); + return -ENODEV; + } + + eeprom = ofnode_path(path); + if (!ofnode_valid(eeprom)) { + printf("%s: invalid hardware path to EEPROM\n", __func__); + return -ENODEV; + } + + ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, devp); + if (ret) { + printf("%s: cannot find EEPROM by node\n", __func__); + return ret; + } + + return ret; +} + +int read_tdx_eeprom_data(u32 eeprom_id, int offset, u8 *buf, + int size) +{ + struct udevice *dev; + int ret; + + ret = get_tdx_eeprom(eeprom_id, &dev); + if (ret) + return ret; + + ret = i2c_eeprom_read(dev, 0x0, buf, size); + if (ret) { + printf("%s: error reading data from EEPROM id: %d!, ret = %d\n", + __func__, eeprom_id, ret); + return ret; + } + + return ret; +} + +int write_tdx_eeprom_data(u32 eeprom_id, int offset, u8 *buf, + int size) +{ + struct udevice *dev; + int ret; + + ret = get_tdx_eeprom(eeprom_id, &dev); + if (ret) + return ret; + + ret = i2c_eeprom_write(dev, 0x0, buf, size); + if (ret) { + printf("%s: error writing data to EEPROM id: %d, ret = %d\n", + __func__, eeprom_id, ret); + return ret; + } + + return ret; +} diff --git a/board/toradex/common/tdx-eeprom.h b/board/toradex/common/tdx-eeprom.h new file mode 100644 index 0000000000..a6772d2f3f --- /dev/null +++ b/board/toradex/common/tdx-eeprom.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2020 Toradex + */ + +#ifndef _TDX_EEPROM_H +#define _TDX_EEPROM_H + +#include + +int read_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size); +int write_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size); + +#endif /* _TDX_EEPROM_H */ From patchwork Wed Jul 15 10:30:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329362 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=a+daA5Q6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DG075QFz9sRf for ; Wed, 15 Jul 2020 20:31:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C2AB81C42; Wed, 15 Jul 2020 12:31:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a+daA5Q6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2598781C42; Wed, 15 Jul 2020 12:31:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C92B181C09 for ; Wed, 15 Jul 2020 12:31:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lf1-x143.google.com with SMTP id c11so776029lfh.8 for ; Wed, 15 Jul 2020 03:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gufhXkalkTowOQczhlvlv0cyBhQrDzQQzwp+9MaQa7I=; b=a+daA5Q6mvSFeWbCGjLxqey2xdXa8ANNq3bkzfabvndlTIu5O/K7lfKcXsjlHmg2Vn LF0x1EIU5Qi0JblDdN+3mxllIhhc85QXgUSmClRGwUzQJrYl6EI3Eqe4ubJ4oJ0D+9IZ j4GC1D0XYD1q7/rdnEc1jh7gPsOXFB15Gq7U/UVaf7B13hr98mqUljsQDeaGZVFq9GOG Xl4jpueE+p3E63luuIy+TELYDvYcuiGbxw7Y20NvohVXRqPa0S/q0ERbT+b14Z5AaWwu 4KSU8sQzcZ4EKPiw0LLyiaHV9W0JkxwqMCruHnC1nBvauZ7Woas6Hfodul0f39RpLiuM V3Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gufhXkalkTowOQczhlvlv0cyBhQrDzQQzwp+9MaQa7I=; b=VWL0N5tQjCi+C6CzJ4QOwqXA4BDEn+9jQya4fHDXzOs/apBkeBebHuVH12Yb8O+4TL FmBdu/Ud1Zv8zJNjo1RDl2YYJMUUpwomnjB/JO3EdncbSs3Vp1rjh8lbDI7cVQLG0VnD 26nS0L7JIxgFbGnBdkTP0WPV+Omzud6G/uOQ9+FwTeRB1D/jahaEeVvlumHLv5HazZa2 7P0o/g3tlE1mji/O1zkyiT1aLJiPGJ44ZiWi46wGWwtbYGbjYoTgCaA4JHrGdAdChA7F 5yD1CdRuGj5SsPlhreOIjrEXqeRuG3udFoRrisA/9ZqjFuWwPCF/rdrmVUEkPv5lL0hO U3rg== X-Gm-Message-State: AOAM531rvWwolynfudh6DNGy3iRFYBJl7OYR8OcCZ1fnTHO4QyanEg5M 8V81B+J1E7iBH8MjJr02+CrOhVWBLb4= X-Google-Smtp-Source: ABdhPJxVy0t0f6pKO1eGe3XVnrWcsLYm5o0VS8WBt5WDa3NBNKkZt3ajmrqopY+4dJ1UOpW+OHtb4A== X-Received: by 2002:a05:6512:3249:: with SMTP id c9mr4472548lfr.216.1594809084664; Wed, 15 Jul 2020 03:31:24 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id v5sm369962lji.75.2020.07.15.03.31.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:23 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Simon Glass , Stefan Agner Subject: [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters Date: Wed, 15 Jul 2020 13:30:54 +0300 Message-Id: <20200715103105.8622-4-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Add defines for supported carrier boards and display adapters. Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/common/tdx-cfg-block.c | 12 ++++++++++++ board/toradex/common/tdx-cfg-block.h | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 75216ecf6d..adf67216c6 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -124,6 +124,18 @@ const char * const toradex_modules[] = { [57] = "Verdin iMX8M Mini DualLite 1GB", }; +const char * const toradex_carrier_boards[] = { + [0] = "UNKNOWN CARRIER BOARD", + [155] = "Dahlia", + [156] = "Verdin Development Board", +}; + +const char * const toradex_display_adapters[] = { + [0] = "UNKNOWN DISPLAY ADAPTER", + [157] = "Verdin DSI to HDMI Adapter", + [159] = "Verdin DSI to LVDS Adapter", +}; + #ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC static int tdx_cfg_block_mmc_storage(u8 *config_block, int write) { diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index d8f3941f26..d58be23abb 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -80,7 +80,18 @@ enum { VERDIN_IMX8MMDL, }; +enum { + DAHLIA = 155, + VERDIN_DEVELOPMENT_BOARD = 156, +}; + +enum { + VERDIN_DSI_TO_HDMI_ADAPTER = 157, + VERDIN_DSI_TO_LVDS_ADAPTER = 159, +}; + extern const char * const toradex_modules[]; +extern const char * const toradex_carrier_boards[]; extern bool valid_cfgblock; extern struct toradex_hw tdx_hw_tag; extern struct toradex_eth_addr tdx_eth_addr; From patchwork Wed Jul 15 10:30:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329365 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FCFXOjI5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DGg6YLCz9sTM for ; Wed, 15 Jul 2020 20:32:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 853A381EE8; Wed, 15 Jul 2020 12:31:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FCFXOjI5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5F5581CB9; Wed, 15 Jul 2020 12:31:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C7EF4819EA for ; Wed, 15 Jul 2020 12:31:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x242.google.com with SMTP id r19so1932409ljn.12 for ; Wed, 15 Jul 2020 03:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t5kgcaQ6m4gBOSyesp3IjLAWBD4fRjjo67aByLh9wyo=; b=FCFXOjI5OmHeehcT757CrTrrNm+Qw6pVUF9yQg/5MMqtjiGdMxoSnz9mUKAXANgHML qpjsUFh1GUCVuSIZifc8OSjNx7yeSmGIPk+EKZAI0aV8x6Hu1wiyotPXfyWv1wSpl+Jh wPJ8zFO2fGNl2NjJJVmuvwktmsn0ByT2sYM7JxIW2GudgCA8U41h3DEmis8yL+5iTyAG 5gL7ABxJetD8LKTc9xCr5yQda6o84g0nM7QQ/PGb4c/yhM7B1Zg/UDUBF5GzdoE9B5eR kWGD+hB04p8UC+oLdNZ1F4YrtiUEx2/AJDR3N2w8RAsrHTkHYPMEL6o1netN/ffJLxv0 z4lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t5kgcaQ6m4gBOSyesp3IjLAWBD4fRjjo67aByLh9wyo=; b=TSzVjiOiFwZvHBIdFQSiUxRIlzwLrHevUs8iBVk/IWAi49j3+GwAfjr8jXPdvDW5Ui 152tqLfh/zlwIQL208nEl3YgVSomQQhXPcaa9UyCUPrz8Ole/HnksHRshjMM/sjy7Qto Tr2/YPBrUD1JDiqPPiV5ur3jzfY6iZjBkipaXuEps/7+PalSo/YrY2Fn+/wC5qsFH2If IK2BK4TmT+k2/RPtJODoNlHYhOXYcXRnQfJLTF6IlItSi0uSIVFnrXRSqStSmmB7DEQI 8TUd/1gIMIHe2V1Xy/XUHQEwVG5z95pa/uNIB/ttURaWzWPeKlIZCP702xsct7ZxJrfN kbnA== X-Gm-Message-State: AOAM531EiXRZ8IH8R1ssJJ3s1QsH9WxIsicFkIwAKT1ouhur20AfxZzZ 8W23ResiQdHxfSDp6YnvYhejuD6DKmc= X-Google-Smtp-Source: ABdhPJxyjWItdEmed/REEygdV78173Gz2fPBXJL6nTDaJM/SlkJyLGaEC7oI1JxF/NT+MjFC9UnYoA== X-Received: by 2002:a2e:8ecc:: with SMTP id e12mr4674431ljl.130.1594809086435; Wed, 15 Jul 2020 03:31:26 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id y188sm487192lfc.36.2020.07.15.03.31.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:25 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Joe Hershberger , Simon Glass , Stefan Agner Subject: [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM Date: Wed, 15 Jul 2020 13:30:55 +0300 Message-Id: <20200715103105.8622-5-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk This introduces support for EEPROM as a storage for the main Toradex config block and additional config blocks on extra EEPROM chips (on carrier board or video adapters). To enable EEPROM as a storage for the main config block: TDX_HAVE_EEPROM=y. For additional EEPROMs please enable this Kconfig symbol: TDX_CFG_BLOCK_EXTRA=y. Information about existing EEPROM chips is provided via Device Tree using aliases. You can also write configuration for the carrier board using create_carrier subcommand for cfgblock. Example: Verdin iMX8MM # cfgblock create_carrier Supported carrier boards: UNKNOWN CARRIER = [0] Verdin Carrier Board = [1] Choose your carrier board (provide ID): 1 Enter carrier board version (e.g. V1.1B): V1.0A Enter carrier board serial number: 10622780 Also with barcode: Verdin iMX8MM # cfgblock create carrier -y 0156100010622780 Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/common/Kconfig | 18 ++ board/toradex/common/tdx-cfg-block.c | 312 +++++++++++++++++++++++---- board/toradex/common/tdx-cfg-block.h | 3 + 3 files changed, 294 insertions(+), 39 deletions(-) diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig index 11f4aab359..36068d2e3b 100644 --- a/board/toradex/common/Kconfig +++ b/board/toradex/common/Kconfig @@ -20,6 +20,12 @@ config TDX_HAVE_NAND config TDX_HAVE_NOR bool +config TDX_HAVE_EEPROM + bool + +config TDX_HAVE_EEPROM_EXTRA + bool + if TDX_CFG_BLOCK config TDX_CFG_BLOCK_IS_IN_MMC @@ -37,6 +43,11 @@ config TDX_CFG_BLOCK_IS_IN_NOR depends on TDX_HAVE_NOR default y +config TDX_CFG_BLOCK_IS_IN_EEPROM + bool + depends on TDX_HAVE_EEPROM + default y + config TDX_CFG_BLOCK_DEV int "Toradex config block eMMC device ID" depends on TDX_CFG_BLOCK_IS_IN_MMC @@ -66,4 +77,11 @@ config TDX_CFG_BLOCK_2ND_ETHADDR Ethernet carrier boards. This options enables the code to set the second Ethernet address as environment variable (eth1addr). +config TDX_CFG_BLOCK_EXTRA + bool "Support for additional EEPROMs (carrier board, display adapter)" + depends on TDX_HAVE_EEPROM_EXTRA + help + Enables fetching auxilary config blocks from carrier board/display + adapter EEPROMs. + endif diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index adf67216c6..5162ed48b8 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -5,6 +5,8 @@ #include #include "tdx-cfg-block.h" +#include "tdx-eeprom.h" + #include #include @@ -37,21 +39,31 @@ DECLARE_GLOBAL_DATA_PTR; #define TAG_VALID 0xcf01 #define TAG_MAC 0x0000 +#define TAG_CAR_SERIAL 0x0021 #define TAG_HW 0x0008 #define TAG_INVALID 0xffff #define TAG_FLAG_VALID 0x1 +#define TDX_EEPROM_ID_MODULE 0 +#define TDX_EEPROM_ID_CARRIER 1 + #if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC) #define TDX_CFG_BLOCK_MAX_SIZE 512 #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND) #define TDX_CFG_BLOCK_MAX_SIZE 64 #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR) #define TDX_CFG_BLOCK_MAX_SIZE 64 +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM) +#define TDX_CFG_BLOCK_MAX_SIZE 64 #else #error Toradex config block location not set #endif +#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA +#define TDX_CFG_BLOCK_EXTRA_MAX_SIZE 64 +#endif + struct toradex_tag { u32 len:14; u32 flags:2; @@ -62,6 +74,11 @@ bool valid_cfgblock; struct toradex_hw tdx_hw_tag; struct toradex_eth_addr tdx_eth_addr; u32 tdx_serial; +#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA +u32 tdx_car_serial; +bool valid_cfgblock_carrier; +struct toradex_hw tdx_car_hw_tag; +#endif const char * const toradex_modules[] = { [0] = "UNKNOWN MODULE", @@ -236,6 +253,20 @@ static int write_tdx_cfg_block_to_nor(unsigned char *config_block) } #endif +#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM +static int read_tdx_cfg_block_from_eeprom(unsigned char *config_block) +{ + return read_tdx_eeprom_data(TDX_EEPROM_ID_MODULE, 0x0, config_block, + TDX_CFG_BLOCK_MAX_SIZE); +} + +static int write_tdx_cfg_block_to_eeprom(unsigned char *config_block) +{ + return write_tdx_eeprom_data(TDX_EEPROM_ID_MODULE, 0x0, config_block, + TDX_CFG_BLOCK_MAX_SIZE); +} +#endif + int read_tdx_cfg_block(void) { int ret = 0; @@ -259,6 +290,8 @@ int read_tdx_cfg_block(void) ret = read_tdx_cfg_block_from_nand(config_block); #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR) ret = read_tdx_cfg_block_from_nor(config_block); +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM) + ret = read_tdx_cfg_block_from_eeprom(config_block); #else ret = -EINVAL; #endif @@ -275,7 +308,12 @@ int read_tdx_cfg_block(void) valid_cfgblock = true; offset = 4; - while (offset < TDX_CFG_BLOCK_MAX_SIZE) { + /* + * check if there is enough space for storing tag and value of the + * biggest element + */ + while (offset + sizeof(struct toradex_tag) + + sizeof(struct toradex_hw) < TDX_CFG_BLOCK_MAX_SIZE) { tag = (struct toradex_tag *)(config_block + offset); offset += 4; if (tag->id == TAG_INVALID) @@ -334,7 +372,6 @@ static int get_cfgblock_interactive(void) it = 'y'; #endif - #if defined(CONFIG_TARGET_APALIS_IMX8) || \ defined(CONFIG_TARGET_APALIS_IMX8X) || \ defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \ @@ -505,7 +542,8 @@ static int get_cfgblock_interactive(void) return 0; } -static int get_cfgblock_barcode(char *barcode) +static int get_cfgblock_barcode(char *barcode, struct toradex_hw *tag, + u32 *serial) { if (strlen(barcode) < 16) { printf("Argument too short, barcode is 16 chars long\n"); @@ -513,31 +551,154 @@ static int get_cfgblock_barcode(char *barcode) } /* Get hardware information from the first 8 digits */ - tdx_hw_tag.ver_major = barcode[4] - '0'; - tdx_hw_tag.ver_minor = barcode[5] - '0'; - tdx_hw_tag.ver_assembly = barcode[7] - '0'; + tag->ver_major = barcode[4] - '0'; + tag->ver_minor = barcode[5] - '0'; + tag->ver_assembly = barcode[7] - '0'; barcode[4] = '\0'; - tdx_hw_tag.prodid = simple_strtoul(barcode, NULL, 10); + tag->prodid = simple_strtoul(barcode, NULL, 10); /* Parse second part of the barcode (serial number */ barcode += 8; - tdx_serial = simple_strtoul(barcode, NULL, 10); + *serial = simple_strtoul(barcode, NULL, 10); return 0; } -static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]) +static int write_tag(u8 *config_block, int *offset, int tag_id, + u8 *tag_data, size_t tag_data_size) { - u8 *config_block; struct toradex_tag *tag; - size_t size = TDX_CFG_BLOCK_MAX_SIZE; + + if (!offset || !config_block) + return -EINVAL; + + tag = (struct toradex_tag *)(config_block + *offset); + tag->id = tag_id; + tag->flags = TAG_FLAG_VALID; + /* len is provided as number of 32bit values after the tag */ + tag->len = (tag_data_size + sizeof(u32) - 1) / sizeof(u32); + *offset += sizeof(struct toradex_tag); + if (tag_data && tag_data_size) { + memcpy(config_block + *offset, tag_data, + tag_data_size); + *offset += tag_data_size; + } + + return 0; +} + +#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA +int read_tdx_cfg_block_carrier(void) +{ + int ret = 0; + u8 *config_block = NULL; + struct toradex_tag *tag; + size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE; + int offset; + + /* Allocate RAM area for carrier config block */ + config_block = memalign(ARCH_DMA_MINALIGN, size); + if (!config_block) { + printf("Not enough malloc space available!\n"); + return -ENOMEM; + } + + memset(config_block, 0, size); + + ret = read_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block, + size); + if (ret) + return ret; + + /* Expect a valid tag first */ + tag = (struct toradex_tag *)config_block; + if (tag->flags != TAG_FLAG_VALID || tag->id != TAG_VALID) { + valid_cfgblock_carrier = false; + ret = -EINVAL; + goto out; + } + valid_cfgblock_carrier = true; + offset = 4; + + while (offset + sizeof(struct toradex_tag) + + sizeof(struct toradex_hw) < TDX_CFG_BLOCK_MAX_SIZE) { + tag = (struct toradex_tag *)(config_block + offset); + offset += 4; + if (tag->id == TAG_INVALID) + break; + + if (tag->flags == TAG_FLAG_VALID) { + switch (tag->id) { + case TAG_CAR_SERIAL: + memcpy(&tdx_car_serial, config_block + offset, + sizeof(tdx_car_serial)); + break; + case TAG_HW: + memcpy(&tdx_car_hw_tag, config_block + + offset, 8); + break; + } + } + + /* Get to next tag according to current tags length */ + offset += tag->len * 4; + } +out: + free(config_block); + return ret; +} + +static int get_cfgblock_carrier_interactive(void) +{ + char message[CONFIG_SYS_CBSIZE]; + int len; + + printf("Supported carrier boards:\n"); + printf("CARRIER BOARD NAME\t\t [ID]\n"); + for (int i = 0; i < sizeof(toradex_carrier_boards) / + sizeof(toradex_carrier_boards[0]); i++) + if (toradex_carrier_boards[i]) + printf("%s \t\t [%d]\n", toradex_carrier_boards[i], i); + + sprintf(message, "Choose your carrier board (provide ID): "); + len = cli_readline(message); + tdx_car_hw_tag.prodid = simple_strtoul(console_buffer, NULL, 10); + + do { + sprintf(message, "Enter carrier board version (e.g. V1.1B): V"); + len = cli_readline(message); + } while (len < 4); + + tdx_car_hw_tag.ver_major = console_buffer[0] - '0'; + tdx_car_hw_tag.ver_minor = console_buffer[2] - '0'; + tdx_car_hw_tag.ver_assembly = console_buffer[3] - 'A'; + + while (len < 8) { + sprintf(message, "Enter carrier board serial number: "); + len = cli_readline(message); + } + + tdx_car_serial = simple_strtoul(console_buffer, NULL, 10); + + return 0; +} + +static int do_cfgblock_carrier_create(struct cmd_tbl *cmdtp, int flag, int argc, + char * const argv[]) +{ + u8 *config_block; + size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE; int offset = 0; int ret = CMD_RET_SUCCESS; int err; int force_overwrite = 0; + if (argc >= 3) { + if (argv[2][0] == '-' && argv[2][1] == 'y') + force_overwrite = 1; + } + /* Allocate RAM area for config block */ config_block = memalign(ARCH_DMA_MINALIGN, size); if (!config_block) { @@ -546,12 +707,95 @@ static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc, } memset(config_block, 0xff, size); + read_tdx_cfg_block_carrier(); + if (valid_cfgblock_carrier && !force_overwrite) { + char message[CONFIG_SYS_CBSIZE]; + + sprintf(message, "A valid Toradex Carrier config block is present, still recreate? [y/N] "); + + if (!cli_readline(message)) + goto out; + + if (console_buffer[0] != 'y' && + console_buffer[0] != 'Y') + goto out; + } + + if (argc < 3 || (force_overwrite && argc < 4)) { + err = get_cfgblock_carrier_interactive(); + } else { + if (force_overwrite) + err = get_cfgblock_barcode(argv[3], &tdx_car_hw_tag, + &tdx_car_serial); + else + err = get_cfgblock_barcode(argv[2], &tdx_car_hw_tag, + &tdx_car_serial); + } + + if (err) { + ret = CMD_RET_FAILURE; + goto out; + } + + /* Valid Tag */ + write_tag(config_block, &offset, TAG_VALID, NULL, 0); + + /* Product Tag */ + write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_car_hw_tag, + sizeof(tdx_car_hw_tag)); + + /* Serial Tag */ + write_tag(config_block, &offset, TAG_CAR_SERIAL, (u8 *)&tdx_car_serial, + sizeof(tdx_car_serial)); + + memset(config_block + offset, 0, 32 - offset); + err = write_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block, + size); + if (err) { + printf("Failed to write Toradex Extra config block: %d\n", + ret); + ret = CMD_RET_FAILURE; + goto out; + } + + printf("Toradex Extra config block successfully written\n"); + +out: + free(config_block); + return ret; +} + +#endif /* CONFIG_TDX_CFG_BLOCK_EXTRA */ + +static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc, + char * const argv[]) +{ + u8 *config_block; + size_t size = TDX_CFG_BLOCK_MAX_SIZE; + int offset = 0; + int ret = CMD_RET_SUCCESS; + int err; + int force_overwrite = 0; if (argc >= 3) { +#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA + if (!strcmp(argv[2], "carrier")) + return do_cfgblock_carrier_create(cmdtp, flag, + --argc, ++argv); +#endif /* CONFIG_TDX_CFG_BLOCK_EXTRA */ if (argv[2][0] == '-' && argv[2][1] == 'y') force_overwrite = 1; } + /* Allocate RAM area for config block */ + config_block = memalign(ARCH_DMA_MINALIGN, size); + if (!config_block) { + printf("Not enough malloc space available!\n"); + return CMD_RET_FAILURE; + } + + memset(config_block, 0xff, size); + read_tdx_cfg_block(); if (valid_cfgblock) { #if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND) @@ -593,9 +837,11 @@ static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc, err = get_cfgblock_interactive(); } else { if (force_overwrite) - err = get_cfgblock_barcode(argv[3]); + err = get_cfgblock_barcode(argv[3], &tdx_hw_tag, + &tdx_serial); else - err = get_cfgblock_barcode(argv[2]); + err = get_cfgblock_barcode(argv[2], &tdx_hw_tag, + &tdx_serial); } if (err) { ret = CMD_RET_FAILURE; @@ -607,39 +853,25 @@ static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc, tdx_eth_addr.nic = htonl(tdx_serial << 8); /* Valid Tag */ - tag = (struct toradex_tag *)config_block; - tag->id = TAG_VALID; - tag->flags = TAG_FLAG_VALID; - tag->len = 0; - offset += 4; + write_tag(config_block, &offset, TAG_VALID, NULL, 0); /* Product Tag */ - tag = (struct toradex_tag *)(config_block + offset); - tag->id = TAG_HW; - tag->flags = TAG_FLAG_VALID; - tag->len = 2; - offset += 4; - - memcpy(config_block + offset, &tdx_hw_tag, 8); - offset += 8; + write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_hw_tag, + sizeof(tdx_hw_tag)); /* MAC Tag */ - tag = (struct toradex_tag *)(config_block + offset); - tag->id = TAG_MAC; - tag->flags = TAG_FLAG_VALID; - tag->len = 2; - offset += 4; + write_tag(config_block, &offset, TAG_MAC, (u8 *)&tdx_eth_addr, + sizeof(tdx_eth_addr)); - memcpy(config_block + offset, &tdx_eth_addr, 6); - offset += 6; memset(config_block + offset, 0, 32 - offset); - #if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC) err = tdx_cfg_block_mmc_storage(config_block, 1); #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND) err = write_tdx_cfg_block_to_nand(config_block); #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR) err = write_tdx_cfg_block_to_nor(config_block); +#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM) + err = write_tdx_cfg_block_to_eeprom(config_block); #else err = -EINVAL; #endif @@ -679,8 +911,10 @@ static int do_cfgblock(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; } -U_BOOT_CMD(cfgblock, 4, 0, do_cfgblock, - "Toradex config block handling commands", - "create [-y] [barcode] - (Re-)create Toradex config block\n" - "cfgblock reload - Reload Toradex config block from flash" +U_BOOT_CMD( + cfgblock, 5, 0, do_cfgblock, + "Toradex config block handling commands", + "create [-y] [barcode] - (Re-)create Toradex config block\n" + "create carrier [-y] [barcode] - (Re-)create Toradex Carrier config block\n" + "cfgblock reload - Reload Toradex config block from flash" ); diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index d58be23abb..e18da3370e 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -94,9 +94,12 @@ extern const char * const toradex_modules[]; extern const char * const toradex_carrier_boards[]; extern bool valid_cfgblock; extern struct toradex_hw tdx_hw_tag; +extern struct toradex_hw tdx_car_hw_tag; extern struct toradex_eth_addr tdx_eth_addr; extern u32 tdx_serial; +extern u32 tdx_car_serial; int read_tdx_cfg_block(void); +int read_tdx_cfg_block_carrier(void); #endif /* _TDX_CFG_BLOCK_H */ From patchwork Wed Jul 15 10:30:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329363 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dBrX4Y/l; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DGC2JZ9z9sTM for ; Wed, 15 Jul 2020 20:32:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99EA781BF0; Wed, 15 Jul 2020 12:31:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dBrX4Y/l"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED39681E6F; Wed, 15 Jul 2020 12:31:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (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 4875F81C21 for ; Wed, 15 Jul 2020 12:31:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x22e.google.com with SMTP id e4so2011783ljn.4 for ; Wed, 15 Jul 2020 03:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C2ty0UqRlCA43A+s6hHkSz7Y8NFYIH/D74yVtUnOiCM=; b=dBrX4Y/lP8eUB2WpWl+7xy5rKMq/xS6GYQdgKtCAhmukp6OpCWLlH54nvEVW6qknys z7t7gG5cPQ37Ry5CHOdkuTm2O+qhi0dnWeGpd/KZ9uNeQKDxeVOR+M3e425ozaL6F44r 4r+3r4Z44rn9sLRw51ks1kgLy2J6x+/eiCDTQv8l+LbfyIiBvV+7XApS+lM8lYKBnHlz jpo9T/6eZsurUixB6HOigP2Rc3Kj9zETrk/at3ecD8AC9Kt9T6camni3zT1bJecK6Y5U NUfkEQ+MmkYm27y9UlCPnT3ReTba2Emc5gYYagOHMI9HGtzDdV/pz428FqwF2eKBHE9u 022w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C2ty0UqRlCA43A+s6hHkSz7Y8NFYIH/D74yVtUnOiCM=; b=mIw3Rp0FHDmBjprn6xjeG+Oi55SSPenQ+GNqYtwdY4wiUbdpaBMlrKlexaN96mqY3t YnKWCmqQ3BTRwa6tj+5ctg9mDYAlcrbIZw7lQweSDrGGXt9/O2nXlDpmuJjms3K0IGqr PTB11abBFdVQFslsD9n3vdkdasb9FIxS5sjqa2iboD11Jy/Z/JurZgrsPD9QooJuJTGz aIH/ocLvtItfA7xvfB0EJ5kLZAybsbfRD1uSXfkGvEhcTqewE8PuloU46wO4qmfNwkyh cQ6KWAubQwZUfSeMEPBzjgqs1ZOv7Rz3FwXVevQ2GtGL7xzuUxiXP1I62rN4VSIJbwHu 4wqA== X-Gm-Message-State: AOAM533Bvsf5NzlIbk/cMLHksVpb3Mfojz7/BXCpGP9iFeYqBscWeteG tSJzdqfGC4GBYuOeIFpvwxe9Mz3rD3o= X-Google-Smtp-Source: ABdhPJw8Qv1TwrjLAhNDlhwI5hD+AnNZKT15yGzjp+eN/QuVAKUplskrYepdwTswYunmJmk7PrpVSg== X-Received: by 2002:a2e:8043:: with SMTP id p3mr4735411ljg.469.1594809088192; Wed, 15 Jul 2020 03:31:28 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id c14sm369800ljj.112.2020.07.15.03.31.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:27 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Simon Glass , Stefan Agner Subject: [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8 Date: Wed, 15 Jul 2020 13:30:56 +0300 Message-Id: <20200715103105.8622-6-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Add migration routine from PID8 pre-stored values on EEPROM (including sane value checks). Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/common/tdx-cfg-block.c | 78 ++++++++++++++++++++++++++++ board/toradex/common/tdx-cfg-block.h | 2 + 2 files changed, 80 insertions(+) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 5162ed48b8..bf27b2fa66 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -649,6 +649,84 @@ out: return ret; } +int check_pid8_sanity(char *pid8) +{ + char s_carrierid_verdin_dev[5]; + char s_carrierid_dahlia[5]; + + sprintf(s_carrierid_verdin_dev, "0%d", VERDIN_DEVELOPMENT_BOARD); + sprintf(s_carrierid_dahlia, "0%d", DAHLIA); + + /* sane value check, first 4 chars which represent carrier id */ + if (!strncmp(pid8, s_carrierid_verdin_dev, 4)) + return 0; + + if (!strncmp(pid8, s_carrierid_dahlia, 4)) + return 0; + + return -EINVAL; +} + +int try_migrate_tdx_cfg_block_carrier(void) +{ + char pid8[8]; + int offset = 0; + int ret = CMD_RET_SUCCESS; + size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE; + u8 *config_block; + + memset(pid8, 0x0, 8); + ret = read_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, (u8 *)pid8, 8); + if (ret) + return ret; + + if (check_pid8_sanity(pid8)) + return -EINVAL; + + /* Allocate RAM area for config block */ + config_block = memalign(ARCH_DMA_MINALIGN, size); + if (!config_block) { + printf("Not enough malloc space available!\n"); + return CMD_RET_FAILURE; + } + + memset(config_block, 0xff, size); + /* we try parse PID8 concatenating zeroed serial number */ + tdx_car_hw_tag.ver_major = pid8[4] - '0'; + tdx_car_hw_tag.ver_minor = pid8[5] - '0'; + tdx_car_hw_tag.ver_assembly = pid8[7] - '0'; + + pid8[4] = '\0'; + tdx_car_hw_tag.prodid = simple_strtoul(pid8, NULL, 10); + + /* Valid Tag */ + write_tag(config_block, &offset, TAG_VALID, NULL, 0); + + /* Product Tag */ + write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_car_hw_tag, + sizeof(tdx_car_hw_tag)); + + /* Serial Tag */ + write_tag(config_block, &offset, TAG_CAR_SERIAL, (u8 *)&tdx_car_serial, + sizeof(tdx_car_serial)); + + memset(config_block + offset, 0, 32 - offset); + ret = write_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block, + size); + if (ret) { + printf("Failed to write Toradex Extra config block: %d\n", + ret); + ret = CMD_RET_FAILURE; + goto out; + } + + printf("Successfully migrated to Toradex Config Block from PID8\n"); + +out: + free(config_block); + return ret; +} + static int get_cfgblock_carrier_interactive(void) { char message[CONFIG_SYS_CBSIZE]; diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index e18da3370e..8f91d9aec6 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -102,4 +102,6 @@ extern u32 tdx_car_serial; int read_tdx_cfg_block(void); int read_tdx_cfg_block_carrier(void); +int try_migrate_tdx_cfg_block_carrier(void); + #endif /* _TDX_CFG_BLOCK_H */ From patchwork Wed Jul 15 10:30:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329364 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fVgZyArp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DGR3lVNz9sTM for ; Wed, 15 Jul 2020 20:32:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D357081C32; Wed, 15 Jul 2020 12:31:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fVgZyArp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 41CDD81C21; Wed, 15 Jul 2020 12:31:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0215581C24 for ; Wed, 15 Jul 2020 12:31:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id h22so1966910lji.9 for ; Wed, 15 Jul 2020 03:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zNVLai7/yZ3eYoUXiUpVdhEc57chc6NQ/suC8QXV7Hs=; b=fVgZyArpZHVVNLMYVoCA+At8yOTXb0Z9nE98EObnoXnZg+Pq0z2v4UjqaiyvvfO66g KN39vjLESOMwojZwcjtm9kizS18+951/EqzJmrO4ZzPeNw/h7PzKKC78o3afi61yGZhW n68TSEpvlFRUAbdIIwp9zq3wBQT1NoU4pUt8rnFAVuCmaZmzr84xrLCqgSgD3NQitASS lkUccpRgey3704FRZXyzmr8Esqn92M/YCWVcth38JrhW6sL3AkpuYITLx+r4K0KvaeAP ImL8qTWU8udbKeOViPgaPKHECd+kvViX63WDwAvMe98niJt0PM8iMU6j0nb/VrI2XHz8 PmFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zNVLai7/yZ3eYoUXiUpVdhEc57chc6NQ/suC8QXV7Hs=; b=mCOawNo5AaCZAdnzKULTHsMUt4kvUqWh10dM44iRn0VZDb1EcqVahIX4SNisOCdmKg nxCDUAw83PXbFugArGBpHAHD+TJ0W880eNAV/CeM3500Wr/WwBtjmatYooNbG3iW9snS xWLEoFhlUWhZwjuiRmIPHcj6PITIFhP+iTyp6NkVbkWBgt1L3GNZP/yB8i3gotwmMCsh i87+UkLujTndESdXX/M2H5lAJCtqh1I54KXl+U2ntpf7hqQKnnPLVoU0f7Xxgmjn2YEH 2+ftFd4L2u4OyzfOEo2qZ0o4FSqyw4hSserAdeyFUiNu+8BIrm9a6a0nFEvzEH6r5UhT ZHNw== X-Gm-Message-State: AOAM531fDSofrrLVyDQUouIrEnHCPK4utRU/KUzHESIlJLNU6czBeUx+ aQm2txEbWtddmpyihiCvosrUFPanx84= X-Google-Smtp-Source: ABdhPJy5tdwSauhyGOY/lsRwxLsfBayTHe2u0zF4zvRyYgVFbLTmF+NYiVh73IN9EDzyRfNFhBNjAA== X-Received: by 2002:a2e:9a16:: with SMTP id o22mr4858206lji.40.1594809089927; Wed, 15 Jul 2020 03:31:29 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id h22sm375826ljg.1.2020.07.15.03.31.28 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:29 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Joe Hershberger , Simon Glass Subject: [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing Date: Wed, 15 Jul 2020 13:30:57 +0300 Message-Id: <20200715103105.8622-7-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Add carrier board info printing during boot time: U-Boot 2020.07-rc4-02435-g1756e05 (Jun 22 2020 - 22:43:59 +0300) CPU: Freescale i.MX8MMQ rev1.0 at 1200 MHz .... Carrier: Toradex Verdin Development Board V1.0A, Serial# 10622780 Verdin iMX8MM # Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/common/tdx-common.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index e8de923f3e..7e353b4fd9 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -19,6 +19,12 @@ static char tdx_serial_str[9]; static char tdx_board_rev_str[6]; +#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA +static char tdx_car_serial_str[9]; +static char tdx_car_rev_str[6]; +static char *tdx_carrier_board_name; +#endif + #ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { @@ -88,6 +94,28 @@ int show_board_info(void) toradex_modules[tdx_hw_tag.prodid], tdx_board_rev_str, tdx_serial_str); +#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA + if (read_tdx_cfg_block_carrier()) { + printf("MISSING TORADEX CARRIER CONFIG BLOCKS\n"); + try_migrate_tdx_cfg_block_carrier(); + } else { + tdx_carrier_board_name = (char *) + toradex_carrier_boards[tdx_car_hw_tag.prodid]; + + sprintf(tdx_car_serial_str, "%08u", tdx_car_serial); + sprintf(tdx_car_rev_str, "V%1d.%1d%c", + tdx_car_hw_tag.ver_major, + tdx_car_hw_tag.ver_minor, + (char)tdx_car_hw_tag.ver_assembly + + 'A'); + + env_set("carrier_serial#", tdx_car_serial_str); + printf("Carrier: Toradex %s %s, Serial# %s\n", + tdx_carrier_board_name, + tdx_car_rev_str, + tdx_car_serial_str); + } +#endif } /* From patchwork Wed Jul 15 10:30:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329367 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BBin6RRr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DH75Wr7z9sTM for ; Wed, 15 Jul 2020 20:32:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D63481EE3; Wed, 15 Jul 2020 12:31:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BBin6RRr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D3BB81EE4; Wed, 15 Jul 2020 12:31:39 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) (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 2A8C481C32 for ; Wed, 15 Jul 2020 12:31:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lf1-x129.google.com with SMTP id t9so785233lfl.5 for ; Wed, 15 Jul 2020 03:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mDm7lQAlgt/aZ0eHyVCy0+I/g6ARVeVABErTmszvgMg=; b=BBin6RRr13JN6+lCHqRUc1ZWRiJNCpQzCa8LF4xLr8jCbgjvvpdFHAV789p51ioBeu bGvR61zLT2WcPSSN5P52bWPs/6gcMa0p48lthwCgVL8c9O0PKGtuDXmpt9umyxZ+erca 0pJm+CjIQ2ROOgVJhjwUTwDvNpc5OPs9S8PYlWYhgNXwsNqWV9um9FC4lnaaTdm/5hwr aSB52/9c+/5XQX9yAODZDE/YgMmw1hkAMc796xSOzsTVeM3nsW7yxVjL696Yvvy9QDNo FHRy7nMp3YUBHwTFtzWFUtwzm+gYdYImZLMTKbE5k2bewKmorPMMov21YQWN3eC7FmMx rsWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mDm7lQAlgt/aZ0eHyVCy0+I/g6ARVeVABErTmszvgMg=; b=ez9xIEE1HXB6GGXeTaRSRiDm/pGZEuWQR81XeQ1Ui719DuofyzzfDSRqGz0iFvfnvT 2w2zh8N1UG7VzLUTrMGxZKPs9lF3Wm7lQjmdgpyIs7ng/eiyB3LVEasvfmEje4NCtSz2 waYx2oiCI9NFvQCEyqAaf9DI2A37LRFVC/H+Xm4r5K7f7xAOocxPLbu3AWgK8SioUAVx DwfPiMM2WGmfc41BAwV4HSs3K/7N1Bx6OiDoQTOg72JLW2241j4535uk6jpcd4Ln93UA 8HgCUrNqFWP5uo5UzrjgrzHHgv1G4qDbjNPvrXOtpUIpqi8eDZKq5OQdccXtjSzoAYlu k/PQ== X-Gm-Message-State: AOAM531tCkeBlYa2t7O/uMvX/Zvru7KbqstW14eko+TDwd2kUmiCoyPp me8WkYManiYZp2+djf8wblfgfUNnRqU= X-Google-Smtp-Source: ABdhPJx+XZ0l76xbgPSsXpP5e9G3DUAy4tzMyMe6ysAhRLVWkMHz9y1iUILoZWMRDwNkjk32iIa1BQ== X-Received: by 2002:ac2:5f04:: with SMTP id 4mr4447815lfq.140.1594809092106; Wed, 15 Jul 2020 03:31:32 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id l14sm407336lfj.13.2020.07.15.03.31.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:30 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , "NXP i.MX U-Boot Team" Subject: [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments Date: Wed, 15 Jul 2020 13:30:58 +0300 Message-Id: <20200715103105.8622-8-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Rename EEPROM nodes. Create aliases for EEPROM to unify their order: eeprom0 - on-module EEPROM eeprom1 - carrier-board EEPROM eeprom2 - MIPI-DSI to HDMI adapter EEPROM Signed-off-by: Igor Opaniuk --- (no changes since v1) arch/arm/dts/imx8mm-verdin.dts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/imx8mm-verdin.dts b/arch/arm/dts/imx8mm-verdin.dts index b86f46e03e..1c67c08c88 100644 --- a/arch/arm/dts/imx8mm-verdin.dts +++ b/arch/arm/dts/imx8mm-verdin.dts @@ -16,6 +16,12 @@ stdout-path = &uart1; }; + aliases { + eeprom0 = &eeprom_module; + eeprom1 = &eeprom_carrier_board; + eeprom2 = &eeprom_display_adapter; + }; + /* fixed clock dedicated to SPI CAN controller */ clk20m: oscillator { compatible = "fixed-clock"; @@ -321,8 +327,8 @@ vcc-supply = <&ldo5_reg>; }; - eeprom@50 { - compatible = "st,24c02"; + eeprom_module: eeprom@50 { + compatible = "st,24c02", "atmel,24c02", "i2c-eeprom"; pagesize = <16>; reg = <0x50>; }; @@ -377,16 +383,16 @@ status = "okay"; }; - /* EEPROM on MIPI-DSI to HDMI adapter */ - eeprom_50: eeprom@50 { - compatible = "st,24c02"; + /* EEPROM on display adapter (MIPI DSI Display Adapter) */ + eeprom_display_adapter: eeprom@50 { + compatible = "st,24c02", "atmel,24c02", "i2c-eeprom"; pagesize = <16>; reg = <0x50>; }; - /* EEPROM on Verdin Development board */ - eeprom_57: eeprom@57 { - compatible = "st,24c02"; + /* EEPROM on carrier board */ + eeprom_carrier_board: eeprom@57 { + compatible = "st,24c02", "atmel,24c02", "i2c-eeprom"; pagesize = <16>; reg = <0x57>; }; From patchwork Wed Jul 15 10:30:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329366 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AS4LQqUW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DGv5hK4z9sTQ for ; Wed, 15 Jul 2020 20:32:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FBAC81F05; Wed, 15 Jul 2020 12:31:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AS4LQqUW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A0A681C32; Wed, 15 Jul 2020 12:31:39 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) (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 0182781C44 for ; Wed, 15 Jul 2020 12:31:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x233.google.com with SMTP id q4so2038868lji.2 for ; Wed, 15 Jul 2020 03:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C+M1pYkECEaMmdh3mPYfTlRmjJ7oJLplZvWKX7NyJgA=; b=AS4LQqUWzzP2jX1qVGhD5EulGgtxBz8tfbMjUcqFoGycsQXvF2jU5ppEmsvCEnIqsf cDB8D7BrhtGENeK9Kuic5O7zxmi0IrRQUCHeZHWlevhGIiIzbgJLkVjL4lH3IyQ0ErPV zBSbRsevLw8pdok3zwQiOQ+7DgBx/OCIdJTv09AunYDJnQkxxxlGq8DhhA9ET1o63WJs gqa9j6oMdvzzRU85wBkLRS+gZZht0qbtw360lGlbD4kvSJuVmv3ruWq2TI7g7dEKHDF9 VpQBKqjShmW6TVp8tY635ra/gvxJ/fgGSwwfpu8UwBI5keUi5DMeOcIYoZP+IkTtr3N6 qb1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C+M1pYkECEaMmdh3mPYfTlRmjJ7oJLplZvWKX7NyJgA=; b=YhXRZnnUJtv/tfOBbUgnqn5P6mP8345jSEwWzSb+xcV361VyHIdNci5CPwbGMGufPQ zxyB13iYSk0Uwu5qM7QKYrEn5fgiJHUiiwe7jQlQRnzuTWAyzRIHhutZfAP0vK3eKvYY ozFf7UHDSc3eHwwXbGMDGCQWvBe7KDnwnoHdlltgcbxfOfwZZv3qv5fJw0BaHJgrKPrB iU4zm5ddpMvS08P+lIxqH9qNoG97+x1OFz/JoDSuDibv9q2/8KfFpvYEWBsxUuoNXpOJ SLz596ZsiA2eml3/4NSLKRbq6A4iHTrDUWqcogcygBcMtQR4XLSPjUNlCHjbHtwVsCKC TrnQ== X-Gm-Message-State: AOAM530mvPFFuGcSBql5vQvBi2qlm6zo2f8ztYT4u3LJVpNL5g9p+jGo OERThhN12fSxgnGnM3ROvBpNtpqJga8= X-Google-Smtp-Source: ABdhPJyEIvU9RXUqrVqYaGN9vEg85wrxtTLnIVDTwLZtMSr6hTBF6suTSaaa5135vzmOv1CkD2scAw== X-Received: by 2002:a2e:870b:: with SMTP id m11mr4224763lji.269.1594809093856; Wed, 15 Jul 2020 03:31:33 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id y21sm374173ljm.30.2020.07.15.03.31.32 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:33 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk Subject: [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board Date: Wed, 15 Jul 2020 13:30:59 +0300 Message-Id: <20200715103105.8622-9-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Enable these Kconfig symbols: TDX_CFG_BLOCK_EXTRA=y TDX_HAVE_EEPROM_EXTRA=y Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/verdin-imx8mm/Kconfig | 6 ++++++ configs/verdin-imx8mm_defconfig | 1 + 2 files changed, 7 insertions(+) diff --git a/board/toradex/verdin-imx8mm/Kconfig b/board/toradex/verdin-imx8mm/Kconfig index 8a2fe98682..149aed6da7 100644 --- a/board/toradex/verdin-imx8mm/Kconfig +++ b/board/toradex/verdin-imx8mm/Kconfig @@ -12,9 +12,15 @@ config SYS_CONFIG_NAME config TDX_CFG_BLOCK default y +config TDX_CFG_BLOCK_EXTRA + default y + config TDX_HAVE_MMC default y +config TDX_HAVE_EEPROM_EXTRA + default y + config TDX_CFG_BLOCK_DEV default "0" diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index 302345f17a..d1c951f122 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -74,6 +74,7 @@ CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_ESDHC_IMX=y From patchwork Wed Jul 15 10:31:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329368 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OghblyLA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DHM0bLgz9sTM for ; Wed, 15 Jul 2020 20:33:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CD0B81F24; Wed, 15 Jul 2020 12:32:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OghblyLA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE67481C24; Wed, 15 Jul 2020 12:31:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 24D5181EE3 for ; Wed, 15 Jul 2020 12:31:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id h22so1967220lji.9 for ; Wed, 15 Jul 2020 03:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U5KgNMFd++FE5nKD3LuCuj+mnC9eLQNLHKKK8adrYXE=; b=OghblyLAO1T00bMBJv2rPyKghiAtKqBmMIwdCO0uQsMJoX1UgOYv43CYfU19zj1JxU Z74hRD9J4QvbKKUZpaaqlfpSmz9+At7kP5fNcpMWXKe2GqKxvBwjl0VCzvgJINPnclaA PIqMTBTZ94INxYVw1Pr7Fi78ApIwxVJOgnWTWB6Dt0GI8Dy+4/mZ6PpMdOLA/ygRCQKI Z0+Qbw4NT7MSvCqi2rBI2eoIPeBWWcFGBAkqwJYA+lXcgPP/ca2M9NZUmNZSiGVpYfQh KqO5LSbf6uIhWvKRmPrMOTpNp7sL5v/b+RWax4Iy8oeXNIJXvWl+u/LMBuXGRckrqsIn PxtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U5KgNMFd++FE5nKD3LuCuj+mnC9eLQNLHKKK8adrYXE=; b=HxM+PuaFL9TRNKjY3DxHgj34NpgWDvGKHedsIcyeBhMsMQ5lvY0pxL0M3uaakdYnoC ZUNKFPWXL3hov87ztqF5RdDBBXBgImEN9QcNgi/2/OShnckGxX7itDCGCyjaECzbSCdX uw9kanpqpSDQNug9RTbQy1TI05cqShhaACcJSOK1LHz6KHlB17+Op7Q/amgsp1sPi2GI CEGshGe1b0hxaKgUzJy0nkihgVyXrPG0tRBNWzIb6Kf97dP1I4knjZ9eGTbNKra59ffX 5rOJ4hpon6HerOxZHW7PASASAdVqsHMXb5yss7SbqBFOZbPG3ocs1YxqV1MJytU/YM8c oz7A== X-Gm-Message-State: AOAM532nL1cj5aFbQ3mnTGVQ2XNGi1MDD+arbvWsuI73YoFVQOAdpHO0 cVEUINK1GiHQQcHK6H8UhLtp816dLHw= X-Google-Smtp-Source: ABdhPJwtxzEfRtLEO4XppWe0AG/WdBp0aHi0CB0U6X44rRu5JK+kG0nnZpO8iC90n0yp67LB/USrbg== X-Received: by 2002:a2e:9c95:: with SMTP id x21mr4505443lji.234.1594809095832; Wed, 15 Jul 2020 03:31:35 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id n25sm373854lji.28.2020.07.15.03.31.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:35 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , "NXP i.MX U-Boot Team" Subject: [PATCH v2 09/14] ARM: dts: imx6ull-colibri: move u-boot specific node Date: Wed, 15 Jul 2020 13:31:00 +0300 Message-Id: <20200715103105.8622-10-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Move aliases and legacy lcdif node to the u-boot specific dts include. 2. Provide proper display timings, as in the downstream Toradex kernel [1]. [1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n183 Signed-off-by: Igor Opaniuk --- (no changes since v1) arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 ++++++++++++++++++++++++ arch/arm/dts/imx6ull-colibri.dtsi | 43 ---------------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi index 531cdcc4da..afdb0f43cf 100644 --- a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi @@ -3,6 +3,15 @@ * Copyright 2019 Toradex AG */ +/ { + aliases { + u-boot,dm-pre-reloc; + mmc0 = &usdhc1; + usb0 = &usbotg1; /* required for ums */ + display0 = &lcdif; + }; +}; + &pinctrl_uart1 { u-boot,dm-pre-reloc; }; @@ -10,3 +19,39 @@ &pinctrl_uart1_ctrl1 { u-boot,dm-pre-reloc; }; + +&lcdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdif_dat + &pinctrl_lcdif_ctrl>; + status = "okay"; + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display0 { + bits-per-pixel = <18>; + bus-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + u-boot,dm-pre-reloc; + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <40>; + hfront-porch = <24>; + vback-porch = <32>; + vfront-porch = <11>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; +}; diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index fca53119fe..b7bf79f28c 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -8,13 +8,6 @@ #include "imx6ull.dtsi" / { - aliases { - u-boot,dm-pre-reloc; - mmc0 = &usdhc1; - usb0 = &usbotg1; /* required for ums */ - display0 = &lcdif; - }; - chosen { stdout-path = &uart1; }; @@ -151,42 +144,6 @@ }; }; -&lcdif { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdif_dat - &pinctrl_lcdif_ctrl>; - status = "okay"; - display = <&display0>; - u-boot,dm-pre-reloc; - - display0: display0 { - bits-per-pixel = <18>; - bus-width = <24>; - status = "okay"; - - display-timings { - native-mode = <&timing_vga>; - timing_vga: 640x480 { - u-boot,dm-pre-reloc; - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <48>; - hfront-porch = <16>; - vback-porch = <33>; - vfront-porch = <10>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; - /* PWM */ &pwm4 { pinctrl-names = "default"; From patchwork Wed Jul 15 10:31:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329369 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Kqh07ppJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DHY691Sz9sTM for ; Wed, 15 Jul 2020 20:33:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF09D81BF0; Wed, 15 Jul 2020 12:32:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Kqh07ppJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9106B81CB9; Wed, 15 Jul 2020 12:31:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E1A6E81C3C for ; Wed, 15 Jul 2020 12:31:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id z24so1975848ljn.8 for ; Wed, 15 Jul 2020 03:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vdGbT0KAg455zQO1HwNMDszkvGRYUyHtA5C+svkAFhk=; b=Kqh07ppJWT3hfTZ5zXVONH46vZfQwSILhNaAW+LDhElRMbR6pDZQnGO/9FOwVOgK5P F8xVncYffPnZ9Qio0nojuV5xmZERpOpGhlPxA2vvnbuAX0k7OrMloMY9JynwyUevSkHy r8FzIjaZ988mpWOLvZ3TFdbNiASGaiNLSzTMJub2anER/fZWEu/9zFVie7gbEd01Sunm jU+1iAdn5RtgjTn11UUjmnGo8WBQJGgdYPUGVkNA+08wyfvawEy8pcR6bS475KZ0LNaD aLKm3qPlMqeZlPKkd40NuGECzh1Gp+l2JD6wb5zdtn7Ol7v+TrqULRcGrL4XxkdBiLD3 BGPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vdGbT0KAg455zQO1HwNMDszkvGRYUyHtA5C+svkAFhk=; b=QVdIJGDco3YcRQ1zwvXY0NPgQte/4+oXNz6non5ck+oxDQMSTMFvG6o2CRX1ZwyRVa M08j8i6ICG/p9nJq83aqV9QZ1xJlCMgtcUciDeFSg6huLOgQwvHYtHnGM04TGe1zxn17 2avSdT/ZUNcYWV82looGnrzkY3BC867mRkhParZjMvuxUEEeBSIkiq06w2aNsc20qKSC 0oOc8SzNONAoZZQriFtAKHrKgePYGrfyNNHP61kZ9ioXrg/3y937z4/h2nFy8uQt0ko9 5lqyDvYZKRyTHsUJki8nFYrqThOg65kLEtdu4e4r4igw3iqEtv5v2pA1bIYWmdWJhRjp gpvQ== X-Gm-Message-State: AOAM530zGCPJ3hU4CWQcSWm/Nj5nqHBvAYzEnmulUlyuvDnURrbeOZv6 2YVbt86hqT1RNXzncrg4g8G94y/7r3M= X-Google-Smtp-Source: ABdhPJwjooX0nvDmXkKAuZjOgPdOCqDcNXuB2Rm5Iudqp6melbVu9FO3PR5NihnODsIVlXaBJ5uI9A== X-Received: by 2002:a2e:9bda:: with SMTP id w26mr4214400ljj.107.1594809097841; Wed, 15 Jul 2020 03:31:37 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id 203sm374839ljf.14.2020.07.15.03.31.36 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:36 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , Joe Hershberger , Simon Glass Subject: [PATCH v2 10/14] toradex: common: show boot logo Date: Wed, 15 Jul 2020 13:31:01 +0300 Message-Id: <20200715103105.8622-11-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Add function for showing boot logo, embed into u-boot blob. Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/common/tdx-common.c | 26 ++++++++++++++++++++++++++ board/toradex/common/tdx-common.h | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 7e353b4fd9..ae6489667f 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -9,6 +9,13 @@ #include #include +#ifdef CONFIG_DM_VIDEO +#include +#include +#include +#include +#endif + #include "tdx-cfg-block.h" #include #include "tdx-common.h" @@ -196,3 +203,22 @@ int ft_common_board_setup(void *blob, bd_t *bd) } #endif /* CONFIG_TDX_CFG_BLOCK */ + +#if defined(CONFIG_DM_VIDEO) +int show_boot_logo(void) +{ + struct udevice *dev; + int ret; + int xpos, ypos; + + splash_get_pos(&xpos, &ypos); + + ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); + if (ret) + return ret; + + ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, xpos, ypos, true); + + return ret; +} +#endif /* CONFIG_DM_VIDEO */ diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h index c537dca71e..63614c8671 100644 --- a/board/toradex/common/tdx-common.h +++ b/board/toradex/common/tdx-common.h @@ -11,4 +11,8 @@ int ft_common_board_setup(void *blob, bd_t *bd); +#if defined(CONFIG_DM_VIDEO) +int show_boot_logo(void); +#endif + #endif /* _TDX_COMMON_H */ From patchwork Wed Jul 15 10:31:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329370 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=brOMoGAU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DHl0vdxz9sTM for ; Wed, 15 Jul 2020 20:33:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5288381F13; Wed, 15 Jul 2020 12:32:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="brOMoGAU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 41A9881EEC; Wed, 15 Jul 2020 12:31:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5069881BF0 for ; Wed, 15 Jul 2020 12:31:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x241.google.com with SMTP id e8so2055103ljb.0 for ; Wed, 15 Jul 2020 03:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P1I2pbhgAhXdHNuZnkceWmDwvq9xR4/KiXmAVfRv9ng=; b=brOMoGAUVITTO/U9oNp9VouGywTLpXD9laLoTi/09A9memj0A13KZzHoMlzqscVp5d nEfRgonvRKUyYQCECOHUGgpFRLRtXflWoaqrk2N9N+Hwqp0Z4yprUnFrg/oXwoaI5kgo UuCWbI1PSlFAYzLdQbH07fQrFkZE2uJsU8VFKnuyb43cxfVcc++xO4JKusUilro2y4fQ 8du8ffiw79Y5/M8CsCMI5xVNdMk7L5B9rg2gMfTMZ5Q/tCQez9z2HS8bUkpxOSB9KYA+ 1CnEAdjcsfpQKTctyTQ+cjP2R2Xunbvau8WeFEruijwovsIZ8zduK/auLwKXd2CgynWs BkiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P1I2pbhgAhXdHNuZnkceWmDwvq9xR4/KiXmAVfRv9ng=; b=ofoKFulqg9x28CBmHNqJ2XJALNxOxsNbpAKddshZxGhlLOHtTt+nNBWX1S/8Cnj3sp k0tXCuoidPDM8qUBHBWjAHeHKe3OX5zbDhseNvtTzDB2my1kagGtlHrWUeJ5kPqfb8QC S4dAcmc/Nq4vy7SrkeOj5dg5H96fVERxYIyAgYZacImhvm2rfPYuHk7EEqXgd9Db1WCI p57Qk52K73XrdWWifIj4Rf+hsAzOppQcgORHDjHjEY2GJDoT9gMTif6mn2xzio09mcY4 e9DD1pTcuGIGD4Cwh79DJpvdheiHUHLBcKZF5fPAmWh20hbC5HiUSGgpBmKNSMRGPoFv ilZA== X-Gm-Message-State: AOAM532mNTexFDxhAA4n3P2CbBUV6ImwDxkNz8kPuwXEykbrVrAXGonO HiGjK5R+sbI7jzouEjaMYUSzfURiw6E= X-Google-Smtp-Source: ABdhPJzCxMaiZtlvmJirbBdQRpUTByowAEp+4YNh0i6ZgdJu1sDMStiMDnOql4vGlklZjgPofT/bFg== X-Received: by 2002:a2e:9cd6:: with SMTP id g22mr4761013ljj.429.1594809100155; Wed, 15 Jul 2020 03:31:40 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id r19sm375332ljm.32.2020.07.15.03.31.38 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:39 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , "NXP i.MX U-Boot Team" Subject: [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates Date: Wed, 15 Jul 2020 13:31:02 +0300 Message-Id: <20200715103105.8622-12-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Move u-boot specific nodes to u-boot dts include: legacy lcdif node and aliases. 2. Add iomux configuration for LCD. 3. Drop un-needed u-boot,dm-pre-reloc for alias node. 4. Fix display-timings, use the one from Toradex downstream kernel [1] [1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n206 Signed-off-by: Igor Opaniuk --- (no changes since v1) arch/arm/dts/imx7-colibri-emmc.dts | 2 +- arch/arm/dts/imx7-colibri-rawnand.dts | 10 ++-- arch/arm/dts/imx7-colibri-u-boot.dtsi | 39 ++++++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 65 +++++++++++++------------- board/toradex/colibri_imx7/MAINTAINERS | 1 + 5 files changed, 79 insertions(+), 38 deletions(-) create mode 100644 arch/arm/dts/imx7-colibri-u-boot.dtsi diff --git a/arch/arm/dts/imx7-colibri-emmc.dts b/arch/arm/dts/imx7-colibri-emmc.dts index bc0d10c716..8545498275 100644 --- a/arch/arm/dts/imx7-colibri-emmc.dts +++ b/arch/arm/dts/imx7-colibri-emmc.dts @@ -5,13 +5,13 @@ /dts-v1/; #include "imx7-colibri.dtsi" +#include "imx7-colibri-u-boot.dtsi" / { model = "Toradex Colibri iMX7D 1GB (eMMC)"; compatible = "toradex,imx7d-colibri-emmc", "fsl,imx7d"; aliases { - u-boot,dm-pre-reloc; mmc0 = &usdhc3; mmc1 = &usdhc1; display1 = &lcdif; diff --git a/arch/arm/dts/imx7-colibri-rawnand.dts b/arch/arm/dts/imx7-colibri-rawnand.dts index 5f12a2ac2a..5211fb1f44 100644 --- a/arch/arm/dts/imx7-colibri-rawnand.dts +++ b/arch/arm/dts/imx7-colibri-rawnand.dts @@ -5,19 +5,21 @@ /dts-v1/; #include "imx7-colibri.dtsi" +#include "imx7-colibri-u-boot.dtsi" / { model = "Toradex Colibri iMX7S/D"; compatible = "toradex,imx7-colibri", "fsl,imx7"; - chosen { - stdout-path = &uart1; - }; - aliases { + display1 = &lcdif; usb0 = &usbotg1; /* required for ums */ }; + chosen { + stdout-path = &uart1; + }; + reg_5v0: regulator-5v0 { compatible = "regulator-fixed"; regulator-name = "5V"; diff --git a/arch/arm/dts/imx7-colibri-u-boot.dtsi b/arch/arm/dts/imx7-colibri-u-boot.dtsi new file mode 100644 index 0000000000..91386476d5 --- /dev/null +++ b/arch/arm/dts/imx7-colibri-u-boot.dtsi @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Copyright 2020 Toradex + */ + +&lcdif { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdif_dat + &pinctrl_lcdif_ctrl>; + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display0 { + bits-per-pixel = <18>; + bus-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <40>; + hfront-porch = <24>; + vback-porch = <32>; + vfront-porch = <11>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; +}; diff --git a/arch/arm/dts/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi index ec95f22a0c..b352036e30 100644 --- a/arch/arm/dts/imx7-colibri.dtsi +++ b/arch/arm/dts/imx7-colibri.dtsi @@ -172,6 +172,38 @@ >; }; + pinctrl_lcdif_dat: lcdif-dat-grp { + fsl,pins = < + MX7D_PAD_LCD_DATA00__LCD_DATA0 0x79 + MX7D_PAD_LCD_DATA01__LCD_DATA1 0x79 + MX7D_PAD_LCD_DATA02__LCD_DATA2 0x79 + MX7D_PAD_LCD_DATA03__LCD_DATA3 0x79 + MX7D_PAD_LCD_DATA04__LCD_DATA4 0x79 + MX7D_PAD_LCD_DATA05__LCD_DATA5 0x79 + MX7D_PAD_LCD_DATA06__LCD_DATA6 0x79 + MX7D_PAD_LCD_DATA07__LCD_DATA7 0x79 + MX7D_PAD_LCD_DATA08__LCD_DATA8 0x79 + MX7D_PAD_LCD_DATA09__LCD_DATA9 0x79 + MX7D_PAD_LCD_DATA10__LCD_DATA10 0x79 + MX7D_PAD_LCD_DATA11__LCD_DATA11 0x79 + MX7D_PAD_LCD_DATA12__LCD_DATA12 0x79 + MX7D_PAD_LCD_DATA13__LCD_DATA13 0x79 + MX7D_PAD_LCD_DATA14__LCD_DATA14 0x79 + MX7D_PAD_LCD_DATA15__LCD_DATA15 0x79 + MX7D_PAD_LCD_DATA16__LCD_DATA16 0x79 + MX7D_PAD_LCD_DATA17__LCD_DATA17 0x79 + >; + }; + + pinctrl_lcdif_ctrl: lcdif-ctrl-grp { + fsl,pins = < + MX7D_PAD_LCD_CLK__LCD_CLK 0x79 + MX7D_PAD_LCD_ENABLE__LCD_ENABLE 0x79 + MX7D_PAD_LCD_VSYNC__LCD_VSYNC 0x79 + MX7D_PAD_LCD_HSYNC__LCD_HSYNC 0x79 + >; + }; + pinctrl_enet1: enet1grp { fsl,pins = < MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 @@ -227,36 +259,3 @@ >; }; }; - -&lcdif { - status = "okay"; - display = <&display0>; - u-boot,dm-pre-reloc; - - display0: display0 { - bits-per-pixel = <18>; - bus-width = <24>; - status = "okay"; - - display-timings { - native-mode = <&timing_vga>; - timing_vga: 640x480 { - u-boot,dm-pre-reloc; - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <48>; - hfront-porch = <16>; - vback-porch = <33>; - vfront-porch = <10>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; diff --git a/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS index 82246be160..61a504487a 100644 --- a/board/toradex/colibri_imx7/MAINTAINERS +++ b/board/toradex/colibri_imx7/MAINTAINERS @@ -9,5 +9,6 @@ F: include/configs/colibri_imx7.h F: configs/colibri_imx7_defconfig F: configs/colibri_imx7_emmc_defconfig F: arch/arm/dts/imx7-colibri.dtsi +F: arch/arm/dts/imx7-colibri-u-boot.dtsi F: arch/arm/dts/imx7-colibri-emmc.dts F: arch/arm/dts/imx7-colibri-rawnand.dts From patchwork Wed Jul 15 10:31:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329371 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=D7fifAIj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DHw4lXfz9sTM for ; Wed, 15 Jul 2020 20:33:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6805581F46; Wed, 15 Jul 2020 12:32:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D7fifAIj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3F4B181C32; Wed, 15 Jul 2020 12:31:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,UPPERCASE_50_75, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 50B4E81C44 for ; Wed, 15 Jul 2020 12:31:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x241.google.com with SMTP id j11so1983507ljo.7 for ; Wed, 15 Jul 2020 03:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9IdK1Vx4wsjKQRzpByE/7hNczsF67b1+YFDp+vTubxg=; b=D7fifAIjDpBIddivLnm5QaQBQuxSet7xpbZ6P778RlxQnAYvZ8bDmGWdUDUU/WK775 rpvebPGe67NbFryTtseEniq+czmKKfzWMESdSuS1lZxGOcMrcIAFWEgt+FoGzNXWI+Ey dgtCmbkDDb54h6erAqIGId4YwzZcvQfoAAIgSslD1Azfd3mWqr9YbUE6el7rz/8nH8X/ sDjod23CCl6lVtUmX7rLI5eBfVW8LndcGoRMXuxDN+ZJhA8zZJ8A1sYbzcTYyjWamYu9 hf70Nqq5fe0Tib0QCMkZLI3GMkW2H97LZvuYAdpCbwa8bRNKE2h1gGObyCUXW8VFW0fz F+EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9IdK1Vx4wsjKQRzpByE/7hNczsF67b1+YFDp+vTubxg=; b=OeCrbvB6scDIVp9onQjQEw29WvIgVF4Q7uF77v85wAUdWFiT5Y591N7o1PxoHLBS8O PDKcCqUIEf+278FgF5YkdK5bKPPmk6ZsTn4Z7Lof0JSQDNN9IaCbcePeu3jzzu9WPbrB jBOtzHUpssSuiQkmXJtrYHIwbSl4tpCc9Yrp0hGUNDaUj7ojW3BKYuskAHJVDnUFEu3H idqHhPoV1lxTVsiSoomqALGNjei87h+vGQa/2CBC8pgdzExXMiDX35A401vu75T0rarb AC+/tRCA6GBBZzrV8td2/QMu0aMFYQVMgrUvwZ903+mMXEtLCox1oK+MGFtWWRYKcB4w +r1Q== X-Gm-Message-State: AOAM530zxZjlcrO37NHJRypzA1MG10BULG4q5vjLqdxeDdd9p8weM/uZ cyrQxObJjPW1ISH3yaMWvYiXQ72PI4U= X-Google-Smtp-Source: ABdhPJxPfuciHnbzE3yvodaSKSqvy/Tw/kpQ7D4c7Ya3/7CECQygX6c2pYefPWhXCVgml7mu60wkYg== X-Received: by 2002:a2e:b019:: with SMTP id y25mr3303601ljk.47.1594809101801; Wed, 15 Jul 2020 03:31:41 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id t4sm408987lfp.21.2020.07.15.03.31.40 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:41 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk Subject: [PATCH v2 12/14] colibri-imx6ull: show boot logo Date: Wed, 15 Jul 2020 13:31:03 +0300 Message-Id: <20200715103105.8622-13-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Show boot logo embed in U-Boot blob. 2. Drop iomux configration for LCD, and use the one provided in device tree. Signed-off-by: Igor Opaniuk --- (no changes since v1) .../toradex/colibri-imx6ull/colibri-imx6ull.c | 40 ++++--------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index c67d02f7c2..8a34872cab 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -57,32 +57,7 @@ static void setup_gpmi_nand(void) } #endif /* CONFIG_NAND_MXS */ -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { - MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_ENABLE__LCDIF_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_HSYNC__LCDIF_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA00__LCDIF_DATA00 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA01__LCDIF_DATA01 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA02__LCDIF_DATA02 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA03__LCDIF_DATA03 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA04__LCDIF_DATA04 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA05__LCDIF_DATA05 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA06__LCDIF_DATA06 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA07__LCDIF_DATA07 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA08__LCDIF_DATA08 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA09__LCDIF_DATA09 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA10__LCDIF_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA11__LCDIF_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA12__LCDIF_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA13__LCDIF_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA14__LCDIF_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA15__LCDIF_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA16__LCDIF_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA17__LCDIF_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), -}; - +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const backlight_pads[] = { /* Backlight On */ MX6_PAD_JTAG_TMS__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL), @@ -95,8 +70,6 @@ static iomux_v3_cfg_t const backlight_pads[] = { static int setup_lcd(void) { - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); /* Set BL_ON */ @@ -153,11 +126,6 @@ int board_init(void) #ifdef CONFIG_NAND_MXS setup_gpmi_nand(); #endif - -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif - return 0; } @@ -203,6 +171,12 @@ int board_late_init(void) } #endif /* CONFIG_CMD_USB_SDP */ +#if defined(CONFIG_DM_VIDEO) + setup_lcd(); + + show_boot_logo(); +#endif + return 0; } From patchwork Wed Jul 15 10:31:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329372 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Oac7TLXy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DJ60kPxz9sTM for ; Wed, 15 Jul 2020 20:33:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C4D5C81F73; Wed, 15 Jul 2020 12:32:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Oac7TLXy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B22181CB9; Wed, 15 Jul 2020 12:31:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (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 8C45B81C09 for ; Wed, 15 Jul 2020 12:31:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x22b.google.com with SMTP id r19so1933269ljn.12 for ; Wed, 15 Jul 2020 03:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KlEiasKqTHoF9oXfc1ceIwkm90DKr8Y65THJT4nlBJI=; b=Oac7TLXy/LJxU/Xrndo2B4ZT6pafW3dQ3xmO2kryx+rkzRiDVZ0bCBK66NiNLKDv0o 9DGFznNGHlL3yatZ56JId8K8zAH+lv4sMLbwaJ9JwBS0fqZKfEyLTLuBT9TPfzOcRcLj O3gz1MNhvkhSkbOMXmrhlZ2h5cTnqhWe25pWaCqI7EhuhctDttLWAeRNeF7wH/lauUd2 RbHZr/g7c+7aFUGoNbZb7t9Uioa/H3ZnhJ8ZeTp5sPd/qE3mapzduouFCEDSl2iqazXN LjScjC66mFZZ2qqF55HASazqw26AiVoeLDdPDyYa2lj9KhNWoZTelaqP4y5Mj+HjNr1x kK2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KlEiasKqTHoF9oXfc1ceIwkm90DKr8Y65THJT4nlBJI=; b=B+2MlBmIrKQdLK2Oca+NpCQn/qrzluKXyCOO71rduX9X+ftiTaibeoYQfaVmETJDpQ ECwfD8XvEO3JIU/+YTwJjyh5dB/xoyRtSlxB9CfA9HSN/APIcAG5n0u3ZJT8nWUc8sOx R+vEiUmOWesXUr1O48/AQA8TXP9u3fjwaJbKbDg483KnAPVI6DGtzCurP4m0uMJK6dZw aroRGlQUt8ARV8qPjNwNzKR3QVk1TLSJjnqrlnwYJjY/SvYik/OAzdmC2oyoNy2ZkoTy kCV1JeexqAzLoDwZxuO1R9/NZoH/Jwjan/HJx0YYhSDUr32zGUzpAfJpT6DMVnI67/Al ONDg== X-Gm-Message-State: AOAM533ycgeBrJM1Xd3UFLHW50bogrOk/AZso8S174XDvgkFvpQ9/y2d ZMaOTiGPb0sth/Xv4hQpfkx99CsIOQo= X-Google-Smtp-Source: ABdhPJyfUq3jVPL3O74f8CeoJ0A+Au1V/Pv6wVQTnN1hI3JOB1iQuKjUUFH7KJUcbiTHLIKS2/KI2Q== X-Received: by 2002:a2e:b4d3:: with SMTP id r19mr4183767ljm.150.1594809103517; Wed, 15 Jul 2020 03:31:43 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id j25sm403143lfh.95.2020.07.15.03.31.42 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:42 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk Subject: [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing Date: Wed, 15 Jul 2020 13:31:04 +0300 Message-Id: <20200715103105.8622-14-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Configure white on black for video console. Signed-off-by: Igor Opaniuk --- (no changes since v1) configs/colibri-imx6ull_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index ce145cd24f..3292fcc85d 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -91,3 +91,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y +CONFIG_SYS_WHITE_ON_BLACK=y From patchwork Wed Jul 15 10:31:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329373 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bjJgjE2i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6DJH6C7nz9sTQ for ; Wed, 15 Jul 2020 20:33:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 11BB681F0A; Wed, 15 Jul 2020 12:32:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="bjJgjE2i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8208D81E3C; Wed, 15 Jul 2020 12:31:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) (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 2B03481C3C for ; Wed, 15 Jul 2020 12:31:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lf1-x134.google.com with SMTP id g2so793988lfb.0 for ; Wed, 15 Jul 2020 03:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2G+/grLjD+rukz4iUjuDsdXjF5KUD0mHeAwwN1QAaGo=; b=bjJgjE2iV/utg4ImlmAxTvuPaT/6NNw3LXVL10BxLydOQIgqi2kuGoBH6q2l6gscYb BztUnQsU45nOV1Nsx34wAP+gPlKLYD2YAYAR3Kqs809/8fXgeZZLbRshixQ1/H2ZW17H MKvR3DMqIoC3pcW5GrQiKhMs2FmjtrIqMOxy6uUlT9U/PyV9UuOb5I4nqttMLKbnHoog zZ4T9ivTgr2QxHmIxjcfskNcygJ5KYm1H178CNfbdpa0iqkWG2VktFNRiaYLpQLezHYX AMcFmvIUMwbBfx8Bq/K4j1EZaEJ9u3xfLbsKQzrz7GVRurj9hnxAMObJETjgZoeOen5+ 0puQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2G+/grLjD+rukz4iUjuDsdXjF5KUD0mHeAwwN1QAaGo=; b=KseUIE2uQWLQgSyNBoUKn4rfiiahupkPqA9mWsa16hRHfqrDcz93yXvACbGxilYHwb HTMYwcJH9k/mhuv2mUi5j30ZY9IgQgXTp/4eOKwMfy5xJme2kIq6w5AzFP1RRDmvyGYz Ww5UU8tcIIKB1SpXITGb3gSW6conyyp5g+X+4hADRDGvvQOKPZqHzPwRj/kPo9EfH7qz uASbDc2yuCNlzAbpYR9kRYWkSDKkZSnW3GXwHOQItO1pDv7ezWkEBE6RSm+99GjqgTxz I4tTZ9K0lPDcvPN0KKmcmdKQItIBSbBIUkDbBR6qJBNhA+QmBBMp4UtOlSx9NXOxquFZ 0Wcw== X-Gm-Message-State: AOAM5307BS1mctxM/zP7bLmA8Cjw6IT5MdoVZNywArMNBMOfQ3C89OVt zyo+AzpGY1DT38VlTFyOhnTJHnByFVs= X-Google-Smtp-Source: ABdhPJyAv/b8Ag8R6OK9zaYCCr2QVrBD9hkAYaiO0OJwrNVU7lV+331TuC6yFjX669flxTfXTwHVAA== X-Received: by 2002:ac2:5984:: with SMTP id w4mr1926670lfn.28.1594809105008; Wed, 15 Jul 2020 03:31:45 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id z16sm371196ljg.68.2020.07.15.03.31.44 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:44 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk Subject: [PATCH v2 14/14] colibri-imx7: fix splash logo drawing Date: Wed, 15 Jul 2020 13:31:05 +0300 Message-Id: <20200715103105.8622-15-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Configure white on black for video console. 2. Enable printing bmp logo during late board init stage. 3. Use iomux configuration from device tree. Signed-off-by: Igor Opaniuk --- (no changes since v1) board/toradex/colibri_imx7/colibri_imx7.c | 44 +++++++---------------- configs/colibri_imx7_defconfig | 2 ++ configs/colibri_imx7_emmc_defconfig | 2 ++ 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 8df925dacf..f585260586 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -100,32 +100,7 @@ static void setup_gpmi_nand(void) } #endif -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { - MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), -}; - +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const backlight_pads[] = { /* Backlight On */ MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL), @@ -139,8 +114,6 @@ static iomux_v3_cfg_t const backlight_pads[] = { static int setup_lcd(void) { - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); /* Set BL_ON */ @@ -215,10 +188,6 @@ int board_init(void) setup_gpmi_nand(); #endif -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif - #ifdef CONFIG_USB_EHCI_MX7 imx_iomux_v3_setup_multiple_pads(usb_cdet_pads, ARRAY_SIZE(usb_cdet_pads)); gpio_request(USB_CDET_GPIO, "usb-cdet-gpio"); @@ -382,4 +351,15 @@ int board_usb_phy_mode(int port) return USB_INIT_HOST; } } + +int board_late_init(void) +{ +#if defined(CONFIG_DM_VIDEO) + setup_lcd(); + + show_boot_logo(); +#endif + return 0; +} + #endif diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 3c49d70260..73015ed825 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -89,3 +89,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index c7bcb87ddd..8ba03a2b38 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -84,3 +84,5 @@ CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_WHITE_ON_BLACK=y