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 8399DC76196 for ; Fri, 31 Mar 2023 17:19:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 683CF85F69; Fri, 31 Mar 2023 19:19:23 +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="qSo6+zLO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 81BFE85F8E; Fri, 31 Mar 2023 19:19:21 +0200 (CEST) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) (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 F061A85F52 for ; Fri, 31 Mar 2023 19:19: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=afd@ti.com Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32VHJEin088372; Fri, 31 Mar 2023 12:19:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680283155; bh=ncXBk17PEGk+H4P6pt1ftzVaXOEd11sqVzIIjw741Qw=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=qSo6+zLOFiZyTgPR+3EyxSucxdg2N2XW5AThYmk3sjHNfNYavO8YTP2yIUQV+opMU jHJV2wVdGUiwYE0CpesRdL3IA+dJSFa7NElf9Dt6Irmm8ZcEgg7q/amoDtMEciLMLc lLE6nJhAJ0/uKNY2GRUCfw/q1NrB6mJ+FbO2iPgY= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32VHJEEb022131 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 31 Mar 2023 12:19:14 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Fri, 31 Mar 2023 12:19:14 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Fri, 31 Mar 2023 12:19:14 -0500 Received: from [10.250.32.170] (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32VHJEaI052621; Fri, 31 Mar 2023 12:19:14 -0500 Message-ID: Date: Fri, 31 Mar 2023 12:19:14 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH] include: configs: Change dtb names in fitImage to match oe-core To: Nishanth Menon , Ryan Eatmon CC: Praneeth Bajjuri , Tom Rini , Bryan Brattlof , References: <20230330210613.17984-1-reatmon@ti.com> <20230331170416.djwalg37btxdaomm@stunned> Content-Language: en-US From: Andrew Davis In-Reply-To: <20230331170416.djwalg37btxdaomm@stunned> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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.8 at phobos.denx.de X-Virus-Status: Clean On 3/31/23 12:04 PM, Nishanth Menon wrote: > On 16:06-20230330, Ryan Eatmon wrote: >> The oe-core class for assembling the fitImage includes the vendor >> sub-directory (with the / changed to _) in the config sections of >> the fitImage. Our env var settings for chosing which section to >> boot from needs to be updated to agree with the fitImage. >> >> Signed-off-by: Ryan Eatmon >> --- >> include/configs/am64x_evm.h | 4 ++-- >> include/configs/am65x_evm.h | 2 +- >> include/configs/j721e_evm.h | 6 +++--- >> include/configs/j721s2_evm.h | 6 +++--- >> 4 files changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h >> index 26a7f2521e..456a44730c 100644 >> --- a/include/configs/am64x_evm.h >> +++ b/include/configs/am64x_evm.h >> @@ -26,9 +26,9 @@ >> #define EXTRA_ENV_AM642_BOARD_SETTINGS \ >> "findfdt=" \ >> "if test $board_name = am64x_gpevm; then " \ >> - "setenv fdtfile k3-am642-evm.dtb; fi; " \ >> + "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \ >> "if test $board_name = am64x_skevm; then " \ >> - "setenv fdtfile k3-am642-sk.dtb; fi;" \ >> + "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \ > > > Kernel.org builds k3-am642-sk.dtb > Nope, kernel.org build ti/k3-am642-sk.dtb > Why would we want to go and fix it with non-standard? > The dtbs need to have their dir prefixed or there could be collisions Andrew >> "if test $fdtfile = undefined; then " \ >> "echo WARNING: Could not determine device tree to use; fi; \0" \ >> "name_kern=Image\0" \ >> diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h >> index 33dd6cfdfa..60a7eb1453 100644 >> --- a/include/configs/am65x_evm.h >> +++ b/include/configs/am65x_evm.h >> @@ -24,7 +24,7 @@ >> /* U-Boot general configuration */ >> #define EXTRA_ENV_AM65X_BOARD_SETTINGS \ >> "findfdt=" \ >> - "setenv name_fdt k3-am654-base-board.dtb;" \ >> + "setenv name_fdt ti_k3-am654-base-board.dtb;" \ >> "setenv fdtfile ${name_fdt}\0" \ >> "name_kern=Image\0" \ >> "console=ttyS2,115200n8\0" \ >> diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h >> index 48b1cea6e3..eac5cd5b76 100644 >> --- a/include/configs/j721e_evm.h >> +++ b/include/configs/j721e_evm.h >> @@ -34,11 +34,11 @@ >> #define EXTRA_ENV_J721E_BOARD_SETTINGS \ >> "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ >> "findfdt=" \ >> - "setenv name_fdt ${default_device_tree};" \ >> + "setenv name_fdt ti_${default_device_tree};" \ >> "if test $board_name = j721e; then " \ >> - "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \ >> + "setenv name_fdt ti_k3-j721e-common-proc-board.dtb; fi;" \ >> "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \ >> - "setenv name_fdt k3-j721e-sk.dtb; fi;" \ >> + "setenv name_fdt ti_k3-j721e-sk.dtb; fi;" \ >> "setenv fdtfile ${name_fdt}\0" \ >> "name_kern=Image\0" \ >> "console=ttyS2,115200n8\0" \ >> diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h >> index bfada9eebc..b30a4a8da4 100644 >> --- a/include/configs/j721s2_evm.h >> +++ b/include/configs/j721s2_evm.h >> @@ -31,11 +31,11 @@ >> #define EXTRA_ENV_J721S2_BOARD_SETTINGS \ >> "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ >> "findfdt=" \ >> - "setenv name_fdt ${default_device_tree};" \ >> + "setenv name_fdt ti_${default_device_tree};" \ >> "if test $board_name = j721s2; then " \ >> - "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \ >> + "setenv name_fdt ti_k3-j721s2-common-proc-board.dtb; fi;" \ >> "if test $board_name = am68-sk; then " \ >> - "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\ >> + "setenv name_fdt ti_k3-am68-sk-base-board.dtb; fi;"\ >> "setenv fdtfile ${name_fdt}\0" \ >> "name_kern=Image\0" \ >> "console=ttyS2,115200n8\0" \ >> -- >> 2.17.1 >> >