From patchwork Thu May 6 11:14:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Vutla X-Patchwork-Id: 1474919 X-Patchwork-Delegate: lokeshvutla@ti.com 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; dkim=pass (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.a=rsa-sha256 header.s=ti-com-17Q1 header.b=Nq9LN/zZ; 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 4FbWGv4qfYz9sV5 for ; Thu, 6 May 2021 21:16:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 359AB82D01; Thu, 6 May 2021 13:15:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.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=ti.com header.i=@ti.com header.b="Nq9LN/zZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D4D282CD9; Thu, 6 May 2021 13:15:21 +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.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) (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 1979C82CD6 for ; Thu, 6 May 2021 13:15:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=lokeshvutla@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 146BFHM6039236 for ; Thu, 6 May 2021 06:15:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1620299717; bh=7ZoqfpHNDLUwtSL2ZM/BcMFb+NpUBWNJTQ4R+BIgQQY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Nq9LN/zZlZSKqdqZabmoR4JtNuAiPxzqSXviYaiur7faflRcDGYPiw9GlORswQVSK K+qqAvMfY2yhpaVuUPhL6c3Iy0+sLl90a9X/s1QbAd+vLsemhQFd46iXs46AmS/HzW +ZV7R2x4wXc7IulmZzbpXTZBxOOhJBnrftcW0ic8= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 146BFG8e111559 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 6 May 2021 06:15:17 -0500 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Thu, 6 May 2021 06:15:16 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2 via Frontend Transport; Thu, 6 May 2021 06:15:16 -0500 Received: from lokesh-ssd.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 146BF6kI059349; Thu, 6 May 2021 06:15:15 -0500 From: Lokesh Vutla To: CC: Lokesh Vutla , Dave Gerlach , Praneeth Bajjuri Subject: [PATCH 04/18] board: ti: am64x: Add support for detecting multiple device trees Date: Thu, 6 May 2021 16:44:51 +0530 Message-ID: <20210506111505.6741-5-lokeshvutla@ti.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210506111505.6741-1-lokeshvutla@ti.com> References: <20210506111505.6741-1-lokeshvutla@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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.4 at phobos.denx.de X-Virus-Status: Clean Update the board_fit_config_name_match() to choose the right dtb. Signed-off-by: Lokesh Vutla --- board/ti/am64x/evm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c index 18e49112ac..a1ffcb929c 100644 --- a/board/ti/am64x/evm.c +++ b/board/ti/am64x/evm.c @@ -46,10 +46,15 @@ int dram_init_banksize(void) #if defined(CONFIG_SPL_LOAD_FIT) int board_fit_config_name_match(const char *name) { -#if defined(CONFIG_TARGET_AM642_A53_EVM) - if (!strcmp(name, "k3-am642-evm")) - return 0; -#endif + bool eeprom_read = board_ti_was_eeprom_read(); + + if (!eeprom_read || board_is_am64x_gpevm()) { + if (!strcmp(name, "k3-am642-r5-evm") || !strcmp(name, "k3-am642-evm")) + return 0; + } else if (board_is_am64x_skevm()) { + if (!strcmp(name, "k3-am642-r5-sk") || !strcmp(name, "k3-am642-sk")) + return 0; + } return -1; }