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 3E746C7619A for ; Thu, 30 Mar 2023 21:52:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF9B585F2C; Thu, 30 Mar 2023 23:51:53 +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="hITWSwr7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A4A70853AA; Thu, 30 Mar 2023 23:06: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 BEE9680A45 for ; Thu, 30 Mar 2023 23:06: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=reatmon@ti.com Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32UL6DWf086667; Thu, 30 Mar 2023 16:06:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680210373; bh=1laC4+UGqhXvuLsHhoRPhYLCkYf90HjHUG6H1notyN4=; h=From:To:Subject:Date; b=hITWSwr7n+SK57o/a8m9J757BV5rU+zLB/JynKCLK0ugQuvOw0UppXmCQpGXZAXT3 gpP9V++qn2pZ1JJeqkwgZTy8aJYYUUhN5Dh7P7mZXaAc7fksM2s513klJKFO6p8wTr 8FEBW8X3s9QzVT7ivTU9wwfjJFQ7SQXjIPvWWj6A= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32UL6DCk130955 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Mar 2023 16:06:13 -0500 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 30 Mar 2023 16:06:13 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE102.ent.ti.com (157.170.170.32) 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; Thu, 30 Mar 2023 16:06:13 -0500 Received: from uda0214219 (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32UL6Du8065812; Thu, 30 Mar 2023 16:06:13 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1phzTJ-0004gl-EB; Thu, 30 Mar 2023 16:06:13 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Tom Rini , Andrew Davis , Bryan Brattlof , Subject: [PATCH] include: configs: Change dtb names in fitImage to match oe-core Date: Thu, 30 Mar 2023 16:06:13 -0500 Message-ID: <20230330210613.17984-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Approved-At: Thu, 30 Mar 2023 23:51:39 +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.8 at phobos.denx.de X-Virus-Status: Clean 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;" \ "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