From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0393DFA3742 for ; Thu, 27 Oct 2022 11:15:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78631850D1; Thu, 27 Oct 2022 13:14:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=mistralsolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=mistralsolutions.com header.i=@mistralsolutions.com header.b="kE4ixWoC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C2D3850B8; Thu, 27 Oct 2022 12:49:20 +0200 (CEST) Received: from egress-ip33b.ess.de.barracuda.com (egress-ip33b.ess.de.barracuda.com [18.185.115.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 18565850BA for ; Thu, 27 Oct 2022 12:49:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=mistralsolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sinthu.raja@mistralsolutions.com Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx-outbound19-64.eu-central-1b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 27 Oct 2022 10:49:16 +0000 Received: by mail-pl1-f200.google.com with SMTP id c10-20020a170902d48a00b001825736b382so793855plg.15 for ; Thu, 27 Oct 2022 03:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mistralsolutions.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cl03Jr+o8/saS8aKBFqkiJiOPzAWkFTGeUwqoDZlfqs=; b=kE4ixWoCSv+Tc02dNVeq/M7htYmZE2JaI7JtzGns9iih2gp42CB6HQLFlk1pR3xPtQ FLhrSs1KsDokFOyeLFHKIJxSaV/OSd5KXdyq3uiUYNMgMGaF55VYCz4L3lXQxlAF1bki GWHn6OTqmTPilMhCzb2avl0MBy1RnDFXbK7xQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cl03Jr+o8/saS8aKBFqkiJiOPzAWkFTGeUwqoDZlfqs=; b=koDXA2LZCDdrbfCNE7Xtm4sHkImoIXl7QGnRWvgo92OqOriRZnv38mvkIBEozLBt7p PzB4cbN8zbwN+wMApZOdlEEZXFo84iAz4Hu7vrT2SM0wwIwzg7jsZnjZ97daq2axE7kD mDZ1vZHWNyIKVRgDF4ezNa8d65sGC26YDW6PHgP6a3Gt5PsAxteBNh1UFezRc9DfQPM/ DJ1+uK+CjsvMvoSrvFTp3S2ZawGUecDbgaPq1oFEiOz0qJQTNgyN/FKpLgrnwXE9YJsr vnkqdG+iKuhGWx8RusqkGExGCnRuOnhtRjiIoZe9MA0kCJ3K6q7KiSbKNunIqocI4j92 mHqg== X-Gm-Message-State: ACrzQf3AJNg3VZ+Vi7Kkvg/LjhXV02HG/BMvHUjp4E50JeKunDnTsgVB 4LOA6w/98w8OlWB1u6gJevsUvf1qvfRuaYQdMLZ0t1O3MutBzc+TSx5Uy8KiSAw2VCMLuYBbszc NTdloc2okE1e9FYbyH1YmAWUTs5zBzzjd7c++kMjOuUJR7wWD4w== X-Received: by 2002:a05:6a00:1d06:b0:56b:ec38:27e9 with SMTP id a6-20020a056a001d0600b0056bec3827e9mr17973045pfx.71.1666867754928; Thu, 27 Oct 2022 03:49:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM58ymLMdmrH7StRdNn4hEoM99TXwwjlFuSIz+FxiXDIbCco9+CLbmCmRYyJQsEWnLKQuSgKUA== X-Received: by 2002:a05:6a00:1d06:b0:56b:ec38:27e9 with SMTP id a6-20020a056a001d0600b0056bec3827e9mr17973015pfx.71.1666867754537; Thu, 27 Oct 2022 03:49:14 -0700 (PDT) Received: from LAP568U.mistral.in ([106.51.69.35]) by smtp.gmail.com with ESMTPSA id 20-20020a630e54000000b0045ccc30e469sm815370pgo.25.2022.10.27.03.49.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 03:49:14 -0700 (PDT) From: Sinthu Raja X-Google-Original-From: Sinthu Raja To: u-boot@lists.denx.de, Simon Glass , Marcel Ziswiler , Marek Vasut , Vignesh Raghavendra Cc: Sinthu Raja Subject: [PATCH 06/11] board: ti: j721s2: Add support for detecting multiple device trees Date: Thu, 27 Oct 2022 16:18:41 +0530 Message-Id: <20221027104846.11820-7-sinthu.raja@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221027104846.11820-1-sinthu.raja@ti.com> References: <20221027104846.11820-1-sinthu.raja@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BESS-ID: 1666867741-304928-5429-7204-3 X-BESS-VER: 2019.1_20221024.2147 X-BESS-Apparent-Source-IP: 209.85.214.200 X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.243747 [from cloudscan9-211.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound 0.00 BSF_SC0_MISMATCH_TO META: Envelope rcpt doesn't match header X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS91090 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND, BSF_SC0_MISMATCH_TO X-BESS-BRTS-Status: 1 X-Mailman-Approved-At: Thu, 27 Oct 2022 13:13:53 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Sinthu Raja Update the board_fit_config_name_match() to choose the right dtb based on the board name read from EEPROM. Also restrict multpile EEPROM reads by verifying if EEPROM is already read Signed-off-by: Sinthu Raja --- board/ti/j721s2/evm.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c index 8ada924e3f..25667900ce 100644 --- a/board/ti/j721s2/evm.c +++ b/board/ti/j721s2/evm.c @@ -79,8 +79,17 @@ int dram_init_banksize(void) #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { - if (!strcmp(name, "k3-j721s2-common-proc-board")) - return 0; + bool eeprom_read = board_ti_was_eeprom_read(); + + if (!eeprom_read || board_is_j721s2_som()) { + if (!strcmp(name, "k3-j721s2-common-proc-board") || + !strcmp(name, "k3-j721s2-r5-common-proc-board")) + return 0; + } else if (!eeprom_read || board_is_am68_sk_som()) { + if (!strcmp(name, "k3-am68-sk-base-board") || + !strcmp(name, "k3-am68-sk-r5-base-board")) + return 0; + } return -1; } @@ -107,6 +116,9 @@ int do_board_detect(void) { int ret; + if (board_ti_was_eeprom_read()) + return 0; + ret = ti_i2c_eeprom_am6_get_base(CONFIG_EEPROM_BUS_ADDRESS, CONFIG_EEPROM_CHIP_ADDRESS); if (ret) { -- 2.36.1